diff options
| author | Marius Kintel <marius@kintel.net> | 2011-11-09 17:40:52 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-11-09 17:40:52 (GMT) |
| commit | cabff81c70f7d9083c47f5be8b5bc071168e6b35 (patch) | |
| tree | b053902ada395ec5cbef8638c897b526ca742857 /tests | |
| parent | ed6dd37dd5e21a665298a4afb68506ce9ac4a138 (diff) | |
| parent | e65ea2d6515f205526c9cba77ad0831e3b4077d1 (diff) | |
Merge branch 'master' into cache
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/regression/dumptest/echo-tests-expected.txt | 9 | ||||
| -rw-r--r-- | tests/regression/echotest/echo-tests-expected.txt | 1 |
3 files changed, 2 insertions, 10 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 4693a0b..81c2faf 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -385,7 +385,7 @@ list(REMOVE_ITEM DUMPTEST_FILES ${CMAKE_SOURCE_DIR}/../examples/example021.scad) list(APPEND ECHO_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/minimal/echo.scad - ${CMAKE_SOURCE_DIR}/../testdata/scad/features/echo-tests.scad + ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/echo-tests.scad ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/escape-test.scad ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/parser-tests.scad ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/builtin-tests.scad) diff --git a/tests/regression/dumptest/echo-tests-expected.txt b/tests/regression/dumptest/echo-tests-expected.txt deleted file mode 100644 index 98a9bd9..0000000 --- a/tests/regression/dumptest/echo-tests-expected.txt +++ /dev/null @@ -1,9 +0,0 @@ - group(); - group(); - group(); - group(); - group(); - group(); - group(); - group(); - diff --git a/tests/regression/echotest/echo-tests-expected.txt b/tests/regression/echotest/echo-tests-expected.txt index cc548f6..ee9705f 100644 --- a/tests/regression/echotest/echo-tests-expected.txt +++ b/tests/regression/echotest/echo-tests-expected.txt @@ -6,3 +6,4 @@ ECHO: [1, "vecstr", 2.34, false] ECHO: [1 : 2 : 10] ECHO: vec = [1, 2, 3] ECHO: range = [0 : 1 : 2] +ECHO: "string generated by str()" |