From 8ba6a7828835308811aa0861650cd04888c9f212 Mon Sep 17 00:00:00 2001 From: don bright Date: Thu, 31 Jan 2013 04:14:09 +0100 Subject: add correct test result images, and minor cleanup diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index d0e5075..246fe63 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -687,6 +687,8 @@ endmacro() enable_testing() + + set_directory_properties(PROPERTIES TEST_INCLUDE_FILE "${CMAKE_SOURCE_DIR}/EnforceConfig.cmake") # Subst files diff --git a/tests/guicgalpngtest.cc b/tests/guicgalpngtest.cc index dd4441c..65e7a72 100644 --- a/tests/guicgalpngtest.cc +++ b/tests/guicgalpngtest.cc @@ -10,7 +10,7 @@ int main( int argc, char * argv[] ) { fprintf(stderr,"%s: wrapper for OpenSCAD at %s\n", argv[0], QUOTE( BINPATH ) ); - if (argc<3 || argc>3) { + if ( argc != 3 ) { fprintf(stderr,"%s: bad number of arguments: %i\n", argv[0], argc); return 1; } @@ -23,6 +23,6 @@ int main( int argc, char * argv[] ) newargs[3] = pngfile; newargs[4] = const_cast("--render"); newargs[5] = NULL; - return execv( QUOTE( BINPATH ), newargs ); + return execv( newargs[0], newargs ); } diff --git a/tests/regression/guicgalpngtest/import_stl-tests-expected.png b/tests/regression/guicgalpngtest/import_stl-tests-expected.png index de7638a..c6a4b2d 100644 Binary files a/tests/regression/guicgalpngtest/import_stl-tests-expected.png and b/tests/regression/guicgalpngtest/import_stl-tests-expected.png differ diff --git a/tests/regression/guicgalpngtest/polygon-intersect-expected.png b/tests/regression/guicgalpngtest/polygon-intersect-expected.png index 6f4f437..54e8d6b 100644 Binary files a/tests/regression/guicgalpngtest/polygon-intersect-expected.png and b/tests/regression/guicgalpngtest/polygon-intersect-expected.png differ diff --git a/tests/regression/guicgalpngtest/polygon-mesh-expected.png b/tests/regression/guicgalpngtest/polygon-mesh-expected.png index 6f4f437..a8fe41a 100644 Binary files a/tests/regression/guicgalpngtest/polygon-mesh-expected.png and b/tests/regression/guicgalpngtest/polygon-mesh-expected.png differ diff --git a/tests/regression/guicgalpngtest/polygon-self-intersect-expected.png b/tests/regression/guicgalpngtest/polygon-self-intersect-expected.png index 6f4f437..b93b5fb 100644 Binary files a/tests/regression/guicgalpngtest/polygon-self-intersect-expected.png and b/tests/regression/guicgalpngtest/polygon-self-intersect-expected.png differ -- cgit v0.10.1