diff options
| author | don bright <hugh.m.bright@gmail.com> | 2013-01-31 03:14:09 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2013-01-31 03:14:09 (GMT) |
| commit | 8ba6a7828835308811aa0861650cd04888c9f212 (patch) | |
| tree | 48c94840fa50de065d69e091d953a619589129d1 | |
| parent | 997a0afac3f9b3a7aa2c4a8d351c3697bc91f7aa (diff) | |
add correct test result images, and minor cleanup
| -rw-r--r-- | tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/guicgalpngtest.cc | 4 | ||||
| -rw-r--r-- | tests/regression/guicgalpngtest/import_stl-tests-expected.png | bin | 5758 -> 10193 bytes | |||
| -rw-r--r-- | tests/regression/guicgalpngtest/polygon-intersect-expected.png | bin | 5170 -> 3012 bytes | |||
| -rw-r--r-- | tests/regression/guicgalpngtest/polygon-mesh-expected.png | bin | 5170 -> 3448 bytes | |||
| -rw-r--r-- | tests/regression/guicgalpngtest/polygon-self-intersect-expected.png | bin | 5170 -> 2918 bytes |
6 files changed, 4 insertions, 2 deletions
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<char *>("--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 Binary files differindex de7638a..c6a4b2d 100644 --- a/tests/regression/guicgalpngtest/import_stl-tests-expected.png +++ b/tests/regression/guicgalpngtest/import_stl-tests-expected.png diff --git a/tests/regression/guicgalpngtest/polygon-intersect-expected.png b/tests/regression/guicgalpngtest/polygon-intersect-expected.png Binary files differindex 6f4f437..54e8d6b 100644 --- a/tests/regression/guicgalpngtest/polygon-intersect-expected.png +++ b/tests/regression/guicgalpngtest/polygon-intersect-expected.png diff --git a/tests/regression/guicgalpngtest/polygon-mesh-expected.png b/tests/regression/guicgalpngtest/polygon-mesh-expected.png Binary files differindex 6f4f437..a8fe41a 100644 --- a/tests/regression/guicgalpngtest/polygon-mesh-expected.png +++ b/tests/regression/guicgalpngtest/polygon-mesh-expected.png diff --git a/tests/regression/guicgalpngtest/polygon-self-intersect-expected.png b/tests/regression/guicgalpngtest/polygon-self-intersect-expected.png Binary files differindex 6f4f437..b93b5fb 100644 --- a/tests/regression/guicgalpngtest/polygon-self-intersect-expected.png +++ b/tests/regression/guicgalpngtest/polygon-self-intersect-expected.png |
