diff options
| -rw-r--r-- | testdata/scad/features/echo-tests.scad | 12 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 25 | ||||
| -rw-r--r-- | tests/echotest.cc | 148 | ||||
| -rw-r--r-- | tests/regression/echotest/echo-expected.txt | 1 | ||||
| -rw-r--r-- | tests/regression/echotest/echo-tests-expected.txt | 8 |
5 files changed, 190 insertions, 4 deletions
diff --git a/testdata/scad/features/echo-tests.scad b/testdata/scad/features/echo-tests.scad new file mode 100644 index 0000000..b07d444 --- /dev/null +++ b/testdata/scad/features/echo-tests.scad @@ -0,0 +1,12 @@ +echo(undef); +echo("string"); +s = "stringvar"; +echo(s); +echo(a = 1, b = 2.0, true, c = false); +v = [1, "vecstr", 2.34, false]; +echo(v); +r = [1:2:10]; +echo(r); + +echo(vec = [1,2,3]); +echo(range = [0:2]); diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 00a9238..3fd283e 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -78,10 +78,10 @@ include_directories(../src) add_definitions(-DOPENSCAD_VERSION=test -DOPENSCAD_YEAR=2011 -DOPENSCAD_MONTH=10) -set(COMMON_SOURCES + +set(CORE_SOURCES ../src/handle_dep.cc ../src/qhash.cc - ../src/export.cc ../src/value.cc ../src/expr.cc ../src/func.cc @@ -107,13 +107,24 @@ set(COMMON_SOURCES ../src/rotateextrude.cc ../src/printutils.cc ../src/progress.cc + ${FLEX_OpenSCADlexer_OUTPUTS} + ${BISON_OpenSCADparser_OUTPUTS}) + +set(COMMON_SOURCES + ${CORE_SOURCES} + ../src/export.cc ../src/nodedumper.cc ../src/traverser.cc ../src/PolySetEvaluator.cc ../src/PolySetCache.cc ../src/Tree.cc - ${FLEX_OpenSCADlexer_OUTPUTS} - ${BISON_OpenSCADparser_OUTPUTS}) +) + +# +# echotest +# +add_executable(echotest echotest.cc ${CORE_SOURCES}) +target_link_libraries(echotest ${QT_LIBRARIES} ${OPENGL_LIBRARY}) # # dumptest @@ -195,6 +206,12 @@ file(GLOB FEATURES_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/features/*.scad) file(GLOB BUGS_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/bugs/*.scad) file(GLOB SCAD_DXF_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/dxf/*.scad) +list(APPEND ECHO_FILES + ${CMAKE_SOURCE_DIR}/../testdata/scad/minimal/echo.scad + ${CMAKE_SOURCE_DIR}/../testdata/scad/features/echo-tests.scad) + +# Add echotest tests to CTest +add_cmdline_test(echotest txt ${ECHO_FILES}) # Add dumptest tests to CTest add_cmdline_test(dumptest txt ${MINIMAL_FILES}) # Add csgtexttest tests to CTest diff --git a/tests/echotest.cc b/tests/echotest.cc new file mode 100644 index 0000000..4811c7c --- /dev/null +++ b/tests/echotest.cc @@ -0,0 +1,148 @@ +/* + * OpenSCAD (www.openscad.org) + * Copyright (C) 2009-2011 Clifford Wolf <clifford@clifford.at> and + * Marius Kintel <marius@kintel.net> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * As a special exception, you have permission to link this program + * with the CGAL library and distribute executables, as long as you + * follow the requirements of the GNU GPL in regard to all of the + * software in the executable aside from CGAL. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include "openscad.h" +#include "handle_dep.h" +#include "node.h" +#include "module.h" +#include "context.h" +#include "value.h" +#include "builtin.h" +#include "printutils.h" + +#include <QApplication> +#include <QFile> +#include <QDir> +#include <QSet> +#include <getopt.h> +#include <assert.h> +#include <iostream> +#include <sstream> + +using std::string; + +std::string commandline_commands; +QString currentdir; +QString examplesdir; +QString librarydir; + +static void stdout_handler(const QString &msg, void *userdata) { + std::cout << msg.toUtf8().data() << std::endl; +} + +int main(int argc, char **argv) +{ + if (argc != 2) { + fprintf(stderr, "Usage: %s <file.scad>\n", argv[0]); + exit(1); + } + + const char *filename = argv[1]; + + int rc = 0; + + set_output_handler(&stdout_handler, NULL); + + initialize_builtin_functions(); + initialize_builtin_modules(); + + QApplication app(argc, argv, false); + QDir original_path = QDir::current(); + + currentdir = QDir::currentPath(); + + QDir libdir(QApplication::instance()->applicationDirPath()); +#ifdef Q_WS_MAC + libdir.cd("../Resources"); // Libraries can be bundled + if (!libdir.exists("libraries")) libdir.cd("../../.."); +#elif defined(Q_OS_UNIX) + if (libdir.cd("../share/openscad/libraries")) { + librarydir = libdir.path(); + } else + if (libdir.cd("../../share/openscad/libraries")) { + librarydir = libdir.path(); + } else + if (libdir.cd("../../libraries")) { + librarydir = libdir.path(); + } else +#endif + if (libdir.cd("libraries")) { + librarydir = libdir.path(); + } + + Context root_ctx; + root_ctx.functions_p = &builtin_functions; + root_ctx.modules_p = &builtin_modules; + root_ctx.set_variable("$fn", Value(0.0)); + root_ctx.set_variable("$fs", Value(1.0)); + root_ctx.set_variable("$fa", Value(12.0)); + root_ctx.set_variable("$t", Value(0.0)); + + Value zero3; + zero3.type = Value::VECTOR; + zero3.append(new Value(0.0)); + zero3.append(new Value(0.0)); + zero3.append(new Value(0.0)); + root_ctx.set_variable("$vpt", zero3); + root_ctx.set_variable("$vpr", zero3); + + + AbstractModule *root_module; + ModuleInstantiation root_inst; + AbstractNode *root_node; + + QFileInfo fileInfo(filename); + handle_dep(filename); + FILE *fp = fopen(filename, "rt"); + if (!fp) { + fprintf(stderr, "Can't open input file `%s'!\n", filename); + exit(1); + } else { + std::stringstream text; + char buffer[513]; + int ret; + while ((ret = fread(buffer, 1, 512, fp)) > 0) { + buffer[ret] = 0; + text << buffer; + } + fclose(fp); + text << commandline_commands; + root_module = parse(text.str().c_str(), fileInfo.absolutePath().toLocal8Bit(), false); + if (!root_module) { + exit(1); + } + } + + QDir::setCurrent(fileInfo.absolutePath()); + + AbstractNode::resetIndexCounter(); + root_node = root_module->evaluate(&root_ctx, &root_inst); + + destroy_builtin_functions(); + destroy_builtin_modules(); + + return rc; +} diff --git a/tests/regression/echotest/echo-expected.txt b/tests/regression/echotest/echo-expected.txt new file mode 100644 index 0000000..8fc094e --- /dev/null +++ b/tests/regression/echotest/echo-expected.txt @@ -0,0 +1 @@ +ECHO: diff --git a/tests/regression/echotest/echo-tests-expected.txt b/tests/regression/echotest/echo-tests-expected.txt new file mode 100644 index 0000000..cc548f6 --- /dev/null +++ b/tests/regression/echotest/echo-tests-expected.txt @@ -0,0 +1,8 @@ +ECHO: undef +ECHO: "string" +ECHO: "stringvar" +ECHO: a = 1, b = 2, true, c = false +ECHO: [1, "vecstr", 2.34, false] +ECHO: [1 : 2 : 10] +ECHO: vec = [1, 2, 3] +ECHO: range = [0 : 1 : 2] |