From 9c14544a92bfd44ab230192a3b74c319f6fe0cc9 Mon Sep 17 00:00:00 2001 From: Marius Kintel Date: Sat, 12 Nov 2011 20:53:12 +0100 Subject: Hooked up function tests diff --git a/testdata/scad/features/len-tests.scad b/testdata/scad/features/len-tests.scad deleted file mode 100644 index fba7ae1..0000000 --- a/testdata/scad/features/len-tests.scad +++ /dev/null @@ -1,12 +0,0 @@ -a=[1,2,3,4]; -b="abcd"; -c=[]; -d=""; -e=[[1,2,3,4],[1,2,3]]; -echo(len(a)); -echo(len(b)); -echo(len(c)); -echo(len(d)); -echo(len(e)); -echo(len(e[1])); -echo(len(e[2])); \ No newline at end of file diff --git a/testdata/scad/functions/len-tests.scad b/testdata/scad/functions/len-tests.scad new file mode 100644 index 0000000..fba7ae1 --- /dev/null +++ b/testdata/scad/functions/len-tests.scad @@ -0,0 +1,12 @@ +a=[1,2,3,4]; +b="abcd"; +c=[]; +d=""; +e=[[1,2,3,4],[1,2,3]]; +echo(len(a)); +echo(len(b)); +echo(len(c)); +echo(len(d)); +echo(len(e)); +echo(len(e[1])); +echo(len(e[2])); \ No newline at end of file diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 9668df7..31420b3 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -370,6 +370,7 @@ list(REMOVE_ITEM FEATURES_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/features/include-test5.scad) file(GLOB BUGS_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/bugs/*.scad) file(GLOB SCAD_DXF_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/dxf/*.scad) +file(GLOB FUNCTION_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/functions/*.scad) file(GLOB EXAMPLE_FILES ${CMAKE_SOURCE_DIR}/../examples/*.scad) list(APPEND DUMPTEST_FILES ${MINIMAL_FILES} ${FEATURES_FILES} ${EXAMPLE_FILES}) @@ -388,7 +389,7 @@ list(REMOVE_ITEM DUMPTEST_FILES ${CMAKE_SOURCE_DIR}/../examples/example016.scad) list(REMOVE_ITEM DUMPTEST_FILES ${CMAKE_SOURCE_DIR}/../examples/example020.scad) list(REMOVE_ITEM DUMPTEST_FILES ${CMAKE_SOURCE_DIR}/../examples/example021.scad) -list(APPEND ECHO_FILES +list(APPEND ECHO_FILES ${FUNCTION_FILES} ${CMAKE_SOURCE_DIR}/../testdata/scad/minimal/echo.scad ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/echo-tests.scad ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/escape-test.scad diff --git a/tests/regression/echotest/len-tests-expected.txt b/tests/regression/echotest/len-tests-expected.txt new file mode 100644 index 0000000..2a776c0 --- /dev/null +++ b/tests/regression/echotest/len-tests-expected.txt @@ -0,0 +1,7 @@ +ECHO: 4 +ECHO: 4 +ECHO: 0 +ECHO: 0 +ECHO: 2 +ECHO: 3 +ECHO: undef -- cgit v0.10.1