Merge remote branch 'upstream/master' into cakebaby

Conflicts:
	doc/testing.txt
	tests/CMakeLists.txt
	tests/system-gl.cc
	tests/system-gl.h

1 files changed, 33 insertions, 26 deletions

diff --git a/doc/testing.txt b/doc/testing.txt
index f90aca8..61f6d75 100644
--- a/doc/testing.txt
+++ b/doc/testing.txt
@@ -1,34 +1,48 @@
 Running regression tests:
 -------------------------
 
-Prerequisites: cmake, python
+Prerequisites: cmake, python, OpenCSG with FBO patch from ../patches applied
 
-cd tests
-mkdir build
-cd build
-cmake ..
-make
-make test
+A) Building test environment
 
-Running on Windows:
+Linux, Mac:
+$ cd tests
+$ cmake .
+$ make
+
+Windows:
 
 First, get a normal build working by following instructions at 
 http://en.wikibooks.org/wiki/OpenSCAD_User_Manual/Building_on_Windows
 Then, from the QT command prompt:
 
-cd tests
-mkdir build
-cd build
-cmake .. -DCMAKE_BUILD_TYPE=Release
-sed -i s/\/MD/\/MT/ CMakeCache.txt
-cmake ..
-nmake -f Makefile
-nmake -f Makefile test
+$ cd tests
+$ cmake . -DCMAKE_BUILD_TYPE=Release
+$ sed -i s/\/MD/\/MT/ CMakeCache.txt
+$ cmake .
+$ nmake -f Makefile
+
+B) Running tests
+
+Easy version:
+$ make test
 
-Running on headless (no X) unix servers:
+Windows:
+$ nmake -f Makefile test
 
-Xvnc :5 -screen 0 800x600x24 &
-DISPLAY=:5 make test
+Headless unix servers (no X11):
+$ Xvfb :5 -screen 0 800x600x24 &
+$ DISPLAY=:5 make test
+
+Partial or extended test runs:
+$ ctest               Runs tests enabled by default
+$ ctest -R <regex>    Runs only matching tests, e.g. ctest -R dxf
+$ ctest -C <configs>  Adds extended tests belonging to configs.
+                      Valid configs:
+                      Default  - Run default tests
+                      Heavy    - Run more time consuming tests (> ~10 seconds)
+                      Examples - test all examples
+                      All      - test everything
 
 Adding  a new regression test:
 ------------------------------
@@ -47,13 +61,6 @@ Adding  a new regression test:
 Troubleshooting a failed test:
 ------------------------------
 
-You can run a single test by passing the test name to ctest:
- $ ctest -R throwntogethertest_sphere
-
-You can run a series of tests by passing part of a name to ctest:
- $ ctest -R cgalpng  # runs all cgalpng tests
- $ ctest -R sphere   # runs all sphere tests
-    
 Logs of test runs are found in tests/build/Testing/Temporary
 Expected results are found in tests/regression/*
 Actual results are found in tests/build/testname-output/*