From c36f5e1c477c9af51080e9fbaf6bd6e55eb0c47c Mon Sep 17 00:00:00 2001 From: Marius Kintel Date: Sun, 31 Oct 2010 12:54:23 +0100 Subject: [PATCH] Removed old code made redundant by tests --- test-code/batch-cgal-tests.sh | 9 --- test-code/batch-cgal.sh | 14 ----- test-code/batch-dump.sh | 16 ----- test-code/cgaltest.pro | 107 ---------------------------------- test-code/csgtermtest.pro | 105 --------------------------------- test-code/csgtexttest.pro | 107 ---------------------------------- test-code/dumptest.pro | 102 -------------------------------- 7 files changed, 460 deletions(-) delete mode 100755 test-code/batch-cgal-tests.sh delete mode 100755 test-code/batch-cgal.sh delete mode 100755 test-code/batch-dump.sh delete mode 100644 test-code/cgaltest.pro delete mode 100644 test-code/csgtermtest.pro delete mode 100644 test-code/csgtexttest.pro delete mode 100644 test-code/dumptest.pro diff --git a/test-code/batch-cgal-tests.sh b/test-code/batch-cgal-tests.sh deleted file mode 100755 index 12b8fe1b..00000000 --- a/test-code/batch-cgal-tests.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -cmd="./cgaltest" - -for f in ../testdata/scad/*-tests.scad; do - echo == `basename $f .scad` == - "$cmd" "$f" -done - diff --git a/test-code/batch-cgal.sh b/test-code/batch-cgal.sh deleted file mode 100755 index 031020d9..00000000 --- a/test-code/batch-cgal.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -cmd="./cgaltest" - -if [ $# == 0 ]; then - dir=../testdata/scad -else - dir=$1 -fi - -for f in $dir/*.scad; do - echo == `basename $f` == - "$cmd" "$f" -done diff --git a/test-code/batch-dump.sh b/test-code/batch-dump.sh deleted file mode 100755 index e8c9cd56..00000000 --- a/test-code/batch-dump.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -cmd="./dumptest" - -if [ $# == 0 ]; then - dir=../testdata/scad -else - dir=$1 -fi - -echo $dir; - -for f in $dir/*.scad; do - echo `basename $f` - "$cmd" "$f" -done diff --git a/test-code/cgaltest.pro b/test-code/cgaltest.pro deleted file mode 100644 index 899bfdf0..00000000 --- a/test-code/cgaltest.pro +++ /dev/null @@ -1,107 +0,0 @@ -DEFINES += OPENSCAD_VERSION=test -TEMPLATE = app - -OBJECTS_DIR = cgal-objects -MOC_DIR = cgal-objects -UI_DIR = cgal-objects -RCC_DIR = cgal-objects -INCLUDEPATH += ../src - -macx { - macx { - DEPLOYDIR = $$(MACOSX_DEPLOY_DIR) - !isEmpty(DEPLOYDIR) { - INCLUDEPATH += $$DEPLOYDIR/include - LIBS += -L$$DEPLOYDIR/lib - } - } - CONFIG -= app_bundle - LIBS += -framework Carbon -} - -CONFIG += qt -QT += opengl -CONFIG += cgal - -include(../cgal.pri) -include(../eigen2.pri) - -LEXSOURCES += ../src/lexer.l -YACCSOURCES += ../src/parser.y - -HEADERS += ../src/builtin.h \ - ../src/cgal.h \ - ../src/context.h \ - ../src/csgterm.h \ - ../src/dxfdata.h \ - ../src/dxfdim.h \ - ../src/dxftess.h \ - ../src/export.h \ - ../src/expression.h \ - ../src/function.h \ - ../src/grid.h \ - ../src/module.h \ - ../src/node.h \ - ../src/dxflinextrudenode.h \ - ../src/dxfrotextrudenode.h \ - ../src/projectionnode.h \ - ../src/importnode.h \ - ../src/csgnode.h \ - ../src/transformnode.h \ - ../src/rendernode.h \ - ../src/openscad.h \ - ../src/polyset.h \ - ../src/printutils.h \ - ../src/value.h \ - ../src/progress.h \ - ../src/traverser.h \ - ../src/csgnode.h \ - ../src/visitor.h \ - ../src/nodedumper.h \ - ../src/CGALRenderer.h \ - ../src/nodecache.h \ - ../src/importnode.h \ - ../src/state.h \ - ../src/PolySetRenderer.h \ - ../src/PolySetCGALRenderer.h \ - ../src/myqhash.h \ - ../src/Tree.h - -SOURCES += cgaltest.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/cgaladv_minkowski2.cc \ - ../src/cgaladv_minkowski3.cc \ - ../src/surface.cc \ - ../src/control.cc \ - ../src/render.cc \ - ../src/import.cc \ - ../src/dxfdata.cc \ - ../src/nef2dxf.cc \ - ../src/dxftess.cc \ - ../src/dxftess-glu.cc \ - ../src/dxftess-cgal.cc \ - ../src/dxfdim.cc \ - ../src/dxflinextrude.cc \ - ../src/dxfrotextrude.cc \ - ../src/printutils.cc \ - ../src/progress.cc \ - ../src/nodedumper.cc \ - ../src/CGALRenderer.cc \ - ../src/traverser.cc \ - ../src/PolySetRenderer.cc \ - ../src/PolySetCGALRenderer.cc \ - ../src/qhash.cc \ - ../src/Tree.cc diff --git a/test-code/csgtermtest.pro b/test-code/csgtermtest.pro deleted file mode 100644 index b2c47a1d..00000000 --- a/test-code/csgtermtest.pro +++ /dev/null @@ -1,105 +0,0 @@ -DEFINES += OPENSCAD_VERSION=test -TEMPLATE = app - -OBJECTS_DIR = objects -MOC_DIR = objects -UI_DIR = objects -RCC_DIR = objects -INCLUDEPATH += ../src - -macx { - CONFIG -= app_bundle - LIBS += -framework Carbon -} - -CONFIG += qt -QT += opengl - -# Optionally specify location of Eigen2 using the -# EIGEN2DIR env. variable -EIGEN2_DIR = $$(EIGEN2DIR) -!isEmpty(EIGEN2_DIR) { - INCLUDEPATH += $$EIGEN2_DIR -} -else { - macx { - INCLUDEPATH += /opt/local/include/eigen2 - } - else { - INCLUDEPATH += /usr/include/eigen2 - } -} - -LEXSOURCES += ../src/lexer.l -YACCSOURCES += ../src/parser.y - -HEADERS += ../src/builtin.h \ - ../src/context.h \ - ../src/csgterm.h \ - ../src/dxfdata.h \ - ../src/dxfdim.h \ - ../src/dxftess.h \ - ../src/export.h \ - ../src/expression.h \ - ../src/function.h \ - ../src/grid.h \ - ../src/module.h \ - ../src/node.h \ - ../src/dxflinextrudenode.h \ - ../src/dxfrotextrudenode.h \ - ../src/projectionnode.h \ - ../src/importnode.h \ - ../src/csgnode.h \ - ../src/transformnode.h \ - ../src/rendernode.h \ - ../src/openscad.h \ - ../src/polyset.h \ - ../src/printutils.h \ - ../src/value.h \ - ../src/progress.h \ - ../src/traverser.h \ - ../src/csgnode.h \ - ../src/visitor.h \ - ../src/nodedumper.h \ - ../src/nodecache.h \ - ../src/importnode.h \ - ../src/state.h \ - ../src/PolySetRenderer.h \ - ../src/Tree.h \ - ../src/myqhash.h \ - ../src/CSGTermRenderer.h - -SOURCES += csgtermtest.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/dxftess-glu.cc \ - ../src/dxftess-cgal.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 \ - ../src/qhash.cc \ - ../src/CSGTermRenderer.cc diff --git a/test-code/csgtexttest.pro b/test-code/csgtexttest.pro deleted file mode 100644 index 8fd47697..00000000 --- a/test-code/csgtexttest.pro +++ /dev/null @@ -1,107 +0,0 @@ -DEFINES += OPENSCAD_VERSION=test -TEMPLATE = app - -OBJECTS_DIR = objects -MOC_DIR = objects -UI_DIR = objects -RCC_DIR = objects -INCLUDEPATH += ../src - -macx { - CONFIG -= app_bundle - LIBS += -framework Carbon -} - -CONFIG += qt -QT += opengl - -# Optionally specify location of Eigen2 using the -# EIGEN2DIR env. variable -EIGEN2_DIR = $$(EIGEN2DIR) -!isEmpty(EIGEN2_DIR) { - INCLUDEPATH += $$EIGEN2_DIR -} -else { - macx { - INCLUDEPATH += /opt/local/include/eigen2 - } - else { - INCLUDEPATH += /usr/include/eigen2 - } -} - -LEXSOURCES += ../src/lexer.l -YACCSOURCES += ../src/parser.y - -HEADERS += ../src/builtin.h \ - ../src/context.h \ - ../src/csgterm.h \ - ../src/dxfdata.h \ - ../src/dxfdim.h \ - ../src/dxftess.h \ - ../src/export.h \ - ../src/expression.h \ - ../src/function.h \ - ../src/grid.h \ - ../src/module.h \ - ../src/node.h \ - ../src/dxflinextrudenode.h \ - ../src/dxfrotextrudenode.h \ - ../src/projectionnode.h \ - ../src/importnode.h \ - ../src/csgnode.h \ - ../src/transformnode.h \ - ../src/rendernode.h \ - ../src/openscad.h \ - ../src/polyset.h \ - ../src/printutils.h \ - ../src/value.h \ - ../src/progress.h \ - ../src/traverser.h \ - ../src/csgnode.h \ - ../src/visitor.h \ - ../src/nodedumper.h \ - ../src/nodecache.h \ - ../src/importnode.h \ - ../src/state.h \ - ../src/PolySetRenderer.h \ - ../src/Tree.h \ - ../src/myqhash.h \ - CSGTextRenderer.h \ - CSGTextCache.h - -SOURCES += csgtexttest.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/dxftess-glu.cc \ - ../src/dxftess-cgal.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 \ - ../src/qhash.cc \ - CSGTextRenderer.cc \ - CSGTextCache.cc diff --git a/test-code/dumptest.pro b/test-code/dumptest.pro deleted file mode 100644 index 96749bfd..00000000 --- a/test-code/dumptest.pro +++ /dev/null @@ -1,102 +0,0 @@ -DEFINES += OPENSCAD_VERSION=test -TEMPLATE = app - -OBJECTS_DIR = objects -MOC_DIR = objects -UI_DIR = objects -RCC_DIR = objects -INCLUDEPATH += ../src - -TARGET = dumptest -macx { - CONFIG -= app_bundle - LIBS += -framework Carbon -} - -CONFIG += qt -QT += opengl - -# Optionally specify location of Eigen2 using the -# EIGEN2DIR env. variable -EIGEN2_DIR = $$(EIGEN2DIR) -!isEmpty(EIGEN2_DIR) { - INCLUDEPATH += $$EIGEN2_DIR -} -else { - macx { - INCLUDEPATH += /opt/local/include/eigen2 - } - else { - INCLUDEPATH += /usr/include/eigen2 - } -} -FORMS += ../src/Preferences.ui -HEADERS += ../src/Preferences.h -SOURCES += ../src/Preferences.cc - -LEXSOURCES += ../src/lexer.l -YACCSOURCES += ../src/parser.y - -HEADERS += ../src/builtin.h \ - ../src/cgal.h \ - ../src/context.h \ - ../src/csgterm.h \ - ../src/dxfdata.h \ - ../src/dxfdim.h \ - ../src/dxftess.h \ - ../src/export.h \ - ../src/expression.h \ - ../src/function.h \ - ../src/grid.h \ - ../src/module.h \ - ../src/node.h \ - ../src/dxflinextrudenode.h \ - ../src/dxfrotextrudenode.h \ - ../src/projectionnode.h \ - ../src/importnode.h \ - ../src/csgnode.h \ - ../src/openscad.h \ - ../src/polyset.h \ - ../src/printutils.h \ - ../src/value.h \ - ../src/progress.h \ - ../src/traverser.h \ - ../src/csgnode.h \ - ../src/visitor.h \ - ../src/nodedumper.h \ - ../src/nodecache.h \ - ../src/importnode.h \ - ../src/state.h \ - ../src/PolySetRenderer.h \ - ../src/Tree.h - -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