moved dumptest to tests dir to enable building from cmake

2 files changed, 244 insertions, 6 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 52db10d..2ad2074 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -2,6 +2,78 @@ cmake_minimum_required(VERSION 2.8)
 project(tests)
 
 #
+# Build test apps
+#
+
+# Qt4
+find_package(OpenGL)
+find_package(Qt4 COMPONENTS QtCore QtGui QtOpenGL REQUIRED)
+include(${QT_USE_FILE})
+include_directories(../src)
+
+# Eigen2
+find_path(EIGEN_INCLUDE_DIRS 
+          Eigen/Core 
+          PATHS ENV EIGEN2DIR /opt/local/include/eigen2 /usr/include/eigen2)
+if (NOT EIGEN_INCLUDE_DIRS)
+  message(FATAL_ERROR "Eigen2 not found")
+else()
+  message(STATUS "Eigen2 found in " ${EIGEN_INCLUDE_DIRS})
+endif()
+include_directories(${EIGEN_INCLUDE_DIRS})
+
+# Flex/Bison
+find_package(BISON)
+find_package(FLEX)
+# The COMPILE_FLAGS and forced C++ compiler is just to be compatible with qmake
+FLEX_TARGET(OpenSCADlexer ../src/lexer.l ${CMAKE_CURRENT_BINARY_DIR}/lexer.cpp COMPILE_FLAGS "-Plexer")
+BISON_TARGET(OpenSCADparser ../src/parser.y ${CMAKE_CURRENT_BINARY_DIR}/parser_yacc.c COMPILE_FLAGS "-p parser")
+ADD_FLEX_BISON_DEPENDENCY(OpenSCADlexer OpenSCADparser)
+set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/parser_yacc.c PROPERTIES LANGUAGE "CXX")
+
+
+# Internal includes
+include_directories(../src)
+
+add_definitions(-DOPENSCAD_VERSION=test)
+
+set(SOURCES dumptest.cc 
+           ../src/export.cc 
+           ../src/value.cc 
+           ../src/expr.cc 
+           ../src/func.cc 
+           ../src/module.cc 
+           ../src/node.cc 
+           ../src/context.cc 
+           ../src/csgterm.cc 
+           ../src/polyset.cc 
+           ../src/csgops.cc 
+           ../src/transform.cc 
+           ../src/primitives.cc 
+           ../src/projection.cc 
+           ../src/cgaladv.cc 
+           ../src/surface.cc 
+           ../src/control.cc 
+           ../src/render.cc 
+           ../src/import.cc 
+           ../src/dxfdata.cc 
+           ../src/dxftess.cc 
+           ../src/dxfdim.cc 
+           ../src/dxflinextrude.cc 
+           ../src/dxfrotextrude.cc 
+           ../src/printutils.cc 
+           ../src/progress.cc 
+           ../src/nodedumper.cc 
+           ../src/traverser.cc 
+           ../src/PolySetRenderer.cc 
+           ../src/Tree.cc
+           ${FLEX_OpenSCADlexer_OUTPUTS}
+           ${BISON_OpenSCADparser_OUTPUTS})
+
+add_executable(dumptest ${SOURCES})
+target_link_libraries(dumptest ${QT_LIBRARIES} ${OPENGL_LIBRARY})
+
+#
 # This functions adds cmd-line tests for those of the FILES which have
 # a corresponding TESTNAME-expected.<suffix> file present.
 #
@@ -11,7 +83,7 @@ function(add_cmdline_test TESTCMD TESTSUFFIX FILES)
     get_filename_component(TESTNAME ${SCADFILE} NAME_WE)
 # FIXME: Run tests even if no expected files are found (to facilitate generating expected files)
 #    if (EXISTS ${CMAKE_SOURCE_DIR}/regression/${TESTCMD_NAME}/${TESTNAME}-expected.${TESTSUFFIX})
-      add_test(${TESTCMD_NAME}_${TESTNAME} ${tests_SOURCE_DIR}/test_cmdline_tool.py -s ${TESTSUFFIX} ${TESTCMD} ${SCADFILE})
+      add_test(${TESTCMD_NAME}_${TESTNAME} ${tests_SOURCE_DIR}/test_cmdline_tool.py -s ${TESTSUFFIX} ${CMAKE_BINARY_DIR}/${TESTCMD} ${SCADFILE})
 #    endif()
   endforeach()
 endfunction()
@@ -22,12 +94,12 @@ enable_testing()
 file(GLOB SCAD_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/*.scad)
 
 # Add dumptest tests to CTest
-add_cmdline_test(${CMAKE_SOURCE_DIR}/../test-code/dumptest txt ${SCAD_FILES})
+add_cmdline_test(dumptest txt ${SCAD_FILES})
 # Add csgtexttest tests to CTest
-add_cmdline_test(${CMAKE_SOURCE_DIR}/../test-code/csgtexttest txt ${SCAD_FILES})
+#add_cmdline_test(${CMAKE_SOURCE_DIR}/../test-code/csgtexttest txt ${SCAD_FILES})
 # Add cgaltest tests to CTest
-add_cmdline_test(${CMAKE_SOURCE_DIR}/../test-code/cgaltest stl ${SCAD_FILES})
+#add_cmdline_test(${CMAKE_SOURCE_DIR}/../test-code/cgaltest stl ${SCAD_FILES})
 # Add dxfexport tests to CTest
-add_cmdline_test(${CMAKE_SOURCE_DIR}/../test-code/exportdxf dxf ${SCAD_FILES})
+#add_cmdline_test(${CMAKE_SOURCE_DIR}/../test-code/exportdxf dxf ${SCAD_FILES})
 # Add csgtermtest tests to CTest
-add_cmdline_test(${CMAKE_SOURCE_DIR}/../test-code/csgtermtest txt ${SCAD_FILES})
+#add_cmdline_test(${CMAKE_SOURCE_DIR}/../test-code/csgtermtest txt ${SCAD_FILES})
diff --git a/tests/dumptest.cc b/tests/dumptest.cc
new file mode 100644
index 0000000..e26259c
--- /dev/null
+++ b/tests/dumptest.cc
@@ -0,0 +1,166 @@
+/*
+ *  OpenSCAD (www.openscad.at)
+ *  Copyright (C) 2009  Clifford Wolf <clifford@clifford.at>
+ *
+ *  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 "node.h"
+#include "module.h"
+#include "context.h"
+#include "value.h"
+#include "export.h"
+#include "builtin.h"
+#include "nodedumper.h"
+#include "Tree.h"
+
+#include <QApplication>
+#include <QFile>
+#include <QDir>
+#include <QSet>
+#include <getopt.h>
+#include <assert.h>
+#include <iostream>
+
+using std::string;
+
+QString commandline_commands;
+const char *make_command = NULL;
+QSet<QString> dependencies;
+QString currentdir;
+QString examplesdir;
+QString librarydir;
+
+void handle_dep(QString filename)
+{
+	if (filename.startsWith("/"))
+		dependencies.insert(filename);
+	else
+		dependencies.insert(QDir::currentPath() + QString("/") + filename);
+	if (!QFile(filename).exists() && make_command) {
+		char buffer[4096];
+		snprintf(buffer, 4096, "%s '%s'", make_command, filename.replace("'", "'\\''").toUtf8().data());
+		system(buffer); // FIXME: Handle error
+	}
+}
+
+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;
+
+	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.vec.append(new Value(0.0));
+	zero3.vec.append(new Value(0.0));
+	zero3.vec.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 {
+		QString text;
+		char buffer[513];
+		int ret;
+		while ((ret = fread(buffer, 1, 512, fp)) > 0) {
+			buffer[ret] = 0;
+			text += buffer;
+		}
+		fclose(fp);
+		root_module = parse((text+commandline_commands).toAscii().data(), fileInfo.absolutePath().toLocal8Bit(), false);
+		if (!root_module) {
+			exit(1);
+		}
+	}
+
+	QDir::setCurrent(fileInfo.absolutePath());
+
+	AbstractNode::resetIndexCounter();
+	root_node = root_module->evaluate(&root_ctx, &root_inst);
+
+	// Cache test
+	QString teststr("test");
+	Tree tree;
+	tree.setRoot(root_node);
+
+	string dumpstdstr = tree.getString(*root_node);
+	string dumpstdstr_cached = tree.getString(*root_node);
+	if (dumpstdstr != dumpstdstr_cached) rc = 1;
+
+	std::cout << dumpstdstr << "\n";
+
+	destroy_builtin_functions();
+	destroy_builtin_modules();
+
+	return rc;
+}