merge

Merge remote branch 'upstream/visitor' into visitortests

Conflicts:
	src/export.cc
	src/openscad.cc
	src/polyset.cc
	src/transform.cc
	tests/CMakeLists.txt
	tests/FindGLEW.cmake
	tests/csgtermtest.cc

1 files changed, 5 insertions, 4 deletions

diff --git a/doc/testing.txt b/doc/testing.txt
index 417a3b9..b64d5a4 100644
--- a/doc/testing.txt
+++ b/doc/testing.txt
@@ -16,12 +16,13 @@ Adding  a new regression test:
 
 1) create a test file at an appropriate location under testdata/
 2) if the test is non-obvious, create a human readable description of the test in the same directory (e.g testdata/scad/mytest.txt)
-3) if a new test app was written, this must be added to tests/CMakeLists
-4) run the test with the environment variable TEST_GENERATE=1, e.g.:
+3) if a new test app was written, this must be added to tests/CMakeLists.txt
+4) Add the tests to the test apps for which you want them to run (in tests/CMakeLists.txt)
+5) run the test with the environment variable TEST_GENERATE=1, e.g.:
    $ TEST_GENERATE=1 ctest -R mytest
    (this will generate a mytest-expected.txt file which is used for regression testing)
-5) manually verify that the output is correct (test-data/scad/mytest-expected.txt)
-6) run the test normally and verify that it passes:
+6) manually verify that the output is correct (tests/regression/<testapp>/mytest-expected.<suffix>)
+7) run the test normally and verify that it passes:
   $ ctest -R mytest
 
 Note that test files which don't have an *-expected.<suffix> file will