Merge pull request #56 from openscad/mingw_cross_tests

Mingw cross tests

1 files changed, 8 insertions, 8 deletions

diff --git a/doc/testing.txt b/doc/testing.txt
index a50c95f..f690939 100644
--- a/doc/testing.txt
+++ b/doc/testing.txt
@@ -10,7 +10,7 @@ $ cd tests
 $ cmake .
 $ make
 
-Windows:
+Windows + MSVC:
 
 First, get a normal build working by following instructions at 
 http://en.wikibooks.org/wiki/OpenSCAD_User_Manual/Building_on_Windows
@@ -22,6 +22,10 @@ Then, from the QT command prompt:
 > cmake .
 > nmake -f Makefile
 
+Cross compiling Linux->Win32:
+
+Please see openscad/tests/CMingw-cross-env.cmake for instructions.
+
 B) Running tests
 
 $ ctest               Runs tests enabled by default
@@ -80,11 +84,7 @@ A pretty-printed index.html is in a subdir of tests/build/Testing/Temporary
 Expected results are found in tests/regression/*
 Actual results are found in tests/build/testname-output/*
 
-3. Cross-compiling 
-
-Cross-compiling of tests has not been automated nor tested
-
-4. Image-based tests takes a long time, they fail, and the log says 'return -11'
+3. Image-based tests takes a long time, they fail, and the log says 'return -11'
 
 Imagemagick may have crashed while comparing the expected images to the 
 test-run generated (actual) images. You can try using the alternate 
@@ -92,12 +92,12 @@ ImageMagick comparison method by by erasing CMakeCache, and re-running
 cmake with -DCOMPARATOR=ncc. This will enable the Normalized Cross 
 Comparison method.
 
-5. Testing images fails with 'morphology not found" for ImageMagick in the log
+4. Testing images fails with 'morphology not found" for ImageMagick in the log
 
 Your version of imagemagick is old. Upgrade, or pass -DCOMPARATOR=old to 
 cmake. The comparison will be of lowered reliability.
 
-6. Other issues
+5. Other issues
 
 The OpenSCAD User Manual has a section on buildling. Please check there 
 for updates: