diff options
| author | Marius Kintel <marius@kintel.net> | 2013-10-07 22:49:08 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-10-07 22:49:08 (GMT) |
| commit | 80e5d42f474919641af3b01d0d317a8365e16e1e (patch) | |
| tree | 3f6f6b860b1042671f6d7a65a1b3b136c5bede10 /tests | |
| parent | 4381743ca998d651735b6569de2f6f01fc36be42 (diff) | |
| parent | aa1752a3a00c25649b290102fad745af1d3b4887 (diff) | |
Merge branch 'master' of ../openscad into steelman-bom-tree-std-stack
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 17 | ||||
| -rw-r--r-- | tests/cgalcachetest.cc | 2 | ||||
| -rw-r--r-- | tests/csgtexttest.cc | 2 | ||||
| -rw-r--r-- | tests/modulecachetest.cc | 2 |
4 files changed, 13 insertions, 10 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index ab94e64..1523e23 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -437,6 +437,9 @@ include_directories(../src) add_definitions(-DOPENSCAD_VERSION=test -DOPENSCAD_YEAR=2011 -DOPENSCAD_MONTH=10) add_definitions(-DOPENSCAD_TESTING) +# Search for MCAD in correct place +set(CTEST_ENVIRONMENT "${CTEST_ENVIRONMENT};OPENSCADPATH=${CMAKE_CURRENT_SOURCE_DIR}/../libraries") + # Platform specific settings if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") @@ -937,31 +940,31 @@ add_cmdline_test(openscad-imgstretch2 EXE ${OPENSCAD_BINPATH} SUFFIX png FILES ${CMAKE_SOURCE_DIR}/../examples/example001.scad) add_cmdline_test(openscad-camdist EXE ${OPENSCAD_BINPATH} - ARGS --imgsize=500,500 --camera=0,0,0,90,0,90,300 examples/example001.scad -o + ARGS --imgsize=500,500 --camera=0,0,0,90,0,90,300 -o SUFFIX png FILES ${CMAKE_SOURCE_DIR}/../examples/example001.scad) add_cmdline_test(openscad-camrot EXE ${OPENSCAD_BINPATH} - ARGS --imgsize=500,500 --camera=0,0,0,440,337.5,315,300 examples/example001.scad -o + ARGS --imgsize=500,500 --camera=0,0,0,440,337.5,315,300 -o SUFFIX png FILES ${CMAKE_SOURCE_DIR}/../examples/example001.scad) add_cmdline_test(openscad-camtrans EXE ${OPENSCAD_BINPATH} - ARGS --imgsize=500,500 --camera=100,-20,-10,90,0,90,300 examples/example001.scad -o + ARGS --imgsize=500,500 --camera=100,-20,-10,90,0,90,300 -o SUFFIX png FILES ${CMAKE_SOURCE_DIR}/../examples/example001.scad) add_cmdline_test(openscad-camortho EXE ${OPENSCAD_BINPATH} - ARGS --imgsize=500,500 --camera=100,-20,-10,90,0,90,300 examples/example001.scad --projection=o -o + ARGS --imgsize=500,500 --camera=100,-20,-10,90,0,90,300 --projection=o -o SUFFIX png FILES ${CMAKE_SOURCE_DIR}/../examples/example001.scad) add_cmdline_test(openscad-cameye EXE ${OPENSCAD_BINPATH} - ARGS --imgsize=500,500 --camera=60,40,30,0,0,0 examples/example001.scad -o + ARGS --imgsize=500,500 --camera=60,40,30,0,0,0 -o SUFFIX png FILES ${CMAKE_SOURCE_DIR}/../examples/example001.scad) add_cmdline_test(openscad-cameye2 EXE ${OPENSCAD_BINPATH} - ARGS --imgsize=500,500 --camera=160,140,130,0,0,0 examples/example001.scad -o + ARGS --imgsize=500,500 --camera=160,140,130,0,0,0 -o SUFFIX png FILES ${CMAKE_SOURCE_DIR}/../examples/example001.scad) add_cmdline_test(openscad-cameyeortho EXE ${OPENSCAD_BINPATH} - ARGS --imgsize=500,500 --camera=160,140,130,0,0,0 examples/example001.scad --projection=o -o + ARGS --imgsize=500,500 --camera=160,140,130,0,0,0 --projection=o -o SUFFIX png FILES ${CMAKE_SOURCE_DIR}/../examples/example001.scad) add_cmdline_test(openscad-camcenter EXE ${OPENSCAD_BINPATH} diff --git a/tests/cgalcachetest.cc b/tests/cgalcachetest.cc index 67d3313..598879c 100644 --- a/tests/cgalcachetest.cc +++ b/tests/cgalcachetest.cc @@ -126,7 +126,7 @@ int main(int argc, char **argv) currentdir = boosty::stringy(fs::current_path()); - parser_init(boosty::stringy(fs::path(argv[0]).branch_path())); + parser_init(boosty::stringy(fs::path(argv[0]).branch_path()), false); add_librarydir(boosty::stringy(fs::path(argv[0]).branch_path() / "../libraries")); ModuleContext top_ctx; diff --git a/tests/csgtexttest.cc b/tests/csgtexttest.cc index 97902f6..0be3123 100644 --- a/tests/csgtexttest.cc +++ b/tests/csgtexttest.cc @@ -77,7 +77,7 @@ int main(int argc, char **argv) currentdir = boosty::stringy( fs::current_path() ); - parser_init(boosty::stringy(fs::path(argv[0]).branch_path())); + parser_init(boosty::stringy(fs::path(argv[0]).branch_path()), false); add_librarydir(boosty::stringy(fs::path(argv[0]).branch_path() / "../libraries")); ModuleContext top_ctx; diff --git a/tests/modulecachetest.cc b/tests/modulecachetest.cc index 5531461..423cffc 100644 --- a/tests/modulecachetest.cc +++ b/tests/modulecachetest.cc @@ -73,7 +73,7 @@ int main(int argc, char **argv) currentdir = boosty::stringy( fs::current_path() ); - parser_init(boosty::stringy(fs::path(argv[0]).branch_path())); + parser_init(boosty::stringy(fs::path(argv[0]).branch_path()), false); add_librarydir(boosty::stringy(fs::path(argv[0]).branch_path() / "../libraries")); ModuleContext top_ctx; |