diff options
| author | chrysn <chrysn@fsfe.org> | 2013-06-25 08:34:10 (GMT) | 
|---|---|---|
| committer | chrysn <chrysn@fsfe.org> | 2013-06-25 12:25:07 (GMT) | 
| commit | a4b5449d4e42556cc2c4799623aa069073e7f9ac (patch) | |
| tree | ccefcb7680eacd245d97f7a74bd47e926b3ef577 /tests | |
| parent | 17cd6d198973ebacd115a90150c598538894a838 (diff) | |
remove test binaries for cgsltest, csgtermtest and opencsgtest
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/.gitignore | 3 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 21 | ||||
| -rw-r--r-- | tests/cgaltest.cc | 120 | ||||
| -rw-r--r-- | tests/csgtermtest.cc | 135 | ||||
| -rw-r--r-- | tests/opencsgtest.cc | 5 | 
5 files changed, 0 insertions, 284 deletions
| diff --git a/tests/.gitignore b/tests/.gitignore index 587154d..8860ee7 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -11,10 +11,7 @@ out.png  /cmake_install.cmake  /lexer.cpp  /parser_yacc.c -/cgaltest -/csgtermtest  /csgtexttest -/opencsgtest  /throwntogethertest  /cgalstlsanitytest  /cgalcachetest diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 10ce4dd..ec75a18 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -534,19 +534,6 @@ add_executable(csgtexttest csgtexttest.cc CSGTextRenderer.cc CSGTextCache.cc)  target_link_libraries(csgtexttest tests-nocgal ${TESTS-NOCGAL-LIBRARIES})  # -# csgtermtest -# -add_executable(csgtermtest csgtermtest.cc ../src/CSGTermEvaluator.cc) -target_link_libraries(csgtermtest tests-nocgal ${TESTS-NOCGAL-LIBRARIES}) - -# -# cgaltest -# -add_executable(cgaltest cgaltest.cc) -set_target_properties(cgaltest PROPERTIES COMPILE_FLAGS "-DENABLE_CGAL ${CGAL_CXX_FLAGS_INIT}") -target_link_libraries(cgaltest tests-cgal ${TESTS-CGAL-LIBRARIES}) - -#  # cgalstlsanitytest  #  add_executable(cgalstlsanitytest cgalstlsanitytest.cc) @@ -561,14 +548,6 @@ set_target_properties(cgalcachetest PROPERTIES COMPILE_FLAGS "-DENABLE_CGAL ${CG  target_link_libraries(cgalcachetest tests-cgal ${TESTS-CGAL-LIBRARIES} ${GLEW_LIBRARY} ${COCOA_LIBRARY})  # -# opencsgtest -# - -add_executable(opencsgtest opencsgtest.cc csgtestcore.cc ../src/OpenCSGRenderer.cc ../src/ThrownTogetherRenderer.cc ../src/renderer.cc ../src/rendersettings.cc) -set_target_properties(opencsgtest PROPERTIES COMPILE_FLAGS "-DENABLE_OPENCSG -DENABLE_CGAL ${CGAL_CXX_FLAGS_INIT}") -target_link_libraries(opencsgtest tests-offscreen tests-cgal ${OPENCSG_LIBRARY} ${TESTS-CGAL-LIBRARIES} ${GLEW_LIBRARY} ${COCOA_LIBRARY}) - -#  # throwntogethertest  # diff --git a/tests/cgaltest.cc b/tests/cgaltest.cc deleted file mode 100644 index d750da9..0000000 --- a/tests/cgaltest.cc +++ /dev/null @@ -1,120 +0,0 @@ -/* - *  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 "tests-common.h" -#include "openscad.h" -#include "parsersettings.h" -#include "node.h" -#include "module.h" -#include "modcontext.h" -#include "value.h" -#include "export.h" -#include "builtin.h" -#include "Tree.h" -#include "CGAL_Nef_polyhedron.h" -#include "CGALEvaluator.h" -#include "PolySetCGALEvaluator.h" - -#ifndef _MSC_VER -#include <getopt.h> -#endif -#include <iostream> -#include <assert.h> -#include <sstream> - -#include <boost/filesystem.hpp> -namespace fs = boost::filesystem; -#include "boosty.h" - -std::string commandline_commands; -std::string currentdir; - -using std::string; - -void cgalTree(Tree &tree) -{ -	assert(tree.root()); - -	CGALEvaluator evaluator(tree); -	Traverser evaluate(evaluator, *tree.root(), Traverser::PRE_AND_POSTFIX); -	evaluate.execute(); -} - -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]; - -	Builtins::instance()->initialize(); - -	fs::path original_path = fs::current_path(); - -	currentdir = boosty::stringy( fs::current_path() ); - -	parser_init(boosty::stringy(fs::path(argv[0]).branch_path())); -	add_librarydir(boosty::stringy(fs::path(argv[0]).branch_path() / "../libraries")); - -	ModuleContext top_ctx; -	top_ctx.registerBuiltin(); - -	FileModule *root_module; -	ModuleInstantiation root_inst("group"); - -	root_module = parsefile(filename); -	if (!root_module) { -		exit(1); -	} - -	if (fs::path(filename).has_parent_path()) { -		fs::current_path(fs::path(filename).parent_path()); -	} - -	AbstractNode::resetIndexCounter(); -	AbstractNode *absolute_root_node = root_module->instantiate(&top_ctx, &root_inst); -	AbstractNode *root_node; -	// Do we have an explicit root node (! modifier)? -	if (!(root_node = find_root_tag(absolute_root_node))) root_node = absolute_root_node; - -	Tree tree(root_node); - -	CGALEvaluator cgalevaluator(tree); - 	PolySetCGALEvaluator psevaluator(cgalevaluator); - -	CGAL_Nef_polyhedron N = cgalevaluator.evaluateCGALMesh(*root_node); - -	current_path(original_path); -	if (!N.isNull()) { -		export_stl(&N, std::cout); -	} - -	Builtins::instance(true); - -	return 0; -} diff --git a/tests/csgtermtest.cc b/tests/csgtermtest.cc deleted file mode 100644 index 1460bbd..0000000 --- a/tests/csgtermtest.cc +++ /dev/null @@ -1,135 +0,0 @@ -/* - *  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 "tests-common.h" -#include "PolySetEvaluator.h" -#include "CSGTermEvaluator.h" -#include "openscad.h" -#include "parsersettings.h" -#include "node.h" -#include "module.h" -#include "modcontext.h" -#include "value.h" -#include "export.h" -#include "builtin.h" -#include "Tree.h" -#include "csgterm.h" - -#ifndef _MSC_VER -#include <getopt.h> -#endif -#include <assert.h> -#include <iostream> -#include <sstream> -#include <fstream> - -#include <boost/filesystem.hpp> -namespace fs = boost::filesystem; -#include "boosty.h" - -std::string commandline_commands; -std::string currentdir; - -using std::cout; - -int main(int argc, char **argv) -{ -	if (argc != 3) { -		fprintf(stderr, "Usage: %s <file.scad> <output.txt>\n", argv[0]); -		exit(1); -	} - -	const char *filename = argv[1]; -	const char *outfilename = argv[2]; - -	int rc = 0; - -	Builtins::instance()->initialize(); - -	fs::path original_path = fs::current_path(); - -	currentdir = boosty::stringy( fs::current_path() ); - -	parser_init(boosty::stringy(fs::path(argv[0]).branch_path())); -	add_librarydir(boosty::stringy(fs::path(argv[0]).branch_path() / "../libraries")); - -	ModuleContext top_ctx; -	top_ctx.registerBuiltin(); - -	FileModule *root_module; -	ModuleInstantiation root_inst("group"); -	const AbstractNode *root_node; - -	root_module = parsefile(filename); -	if (!root_module) { -		exit(1); -	} - -	if (fs::path(filename).has_parent_path()) { -		fs::current_path(fs::path(filename).parent_path()); -	} - -	AbstractNode::resetIndexCounter(); -	root_node = root_module->instantiate(&top_ctx, &root_inst); - -	Tree tree(root_node); - -//	cout << tree.getString(*root_node) << "\n"; - -	std::vector<shared_ptr<CSGTerm> > highlights; -	std::vector<shared_ptr<CSGTerm> > background; -	PolySetEvaluator psevaluator(tree); -	CSGTermEvaluator evaluator(tree, &psevaluator); -	shared_ptr<CSGTerm> root_term = evaluator.evaluateCSGTerm(*root_node, highlights, background); -	 -	// cout << "Stored terms: " << evaluator.stored_term.size() << "\n"; -	// for (map<int, class CSGTerm*>::iterator iter = evaluator.stored_term.begin(); -	// 		 iter != evaluator.stored_term.end(); -	// 		 iter++) { -	// 	cout << iter->first << ":" << (iter->second ? iter->second->label : "NULL") << "\n"; -	// } - -	// if (evaluator.background) cout << "Background terms: " << evaluator.background->size() << "\n"; -	// if (evaluator.highlights) cout << "Highlights terms: " << evaluator.highlights->size() << "\n"; - -	current_path(original_path); -	std::ofstream outfile; -	outfile.open(outfilename); -	if (root_term) { -		outfile << root_term->dump() << "\n"; -	} -	else { -		outfile << "No top-level CSG object\n"; -	} -	outfile.close(); - -	delete root_node; -	delete root_module; - -	Builtins::instance(true); - -	return rc; -} diff --git a/tests/opencsgtest.cc b/tests/opencsgtest.cc deleted file mode 100644 index 06cfe86..0000000 --- a/tests/opencsgtest.cc +++ /dev/null @@ -1,5 +0,0 @@ -#include "csgtestcore.h" - -int main(int argc, char* argv[]) { -	return csgtestcore(argc, argv, TEST_OPENCSG); -} | 
