Reorganized the testdata dir

git-svn-id: http://svn.clifford.at/openscad/trunk@494 b57f626f-c46c-0410-a088-ec61d464b74c

35 files changed, 29 insertions, 1 deletions

diff --git a/scripts/batch-2d.sh b/scripts/batch-2d.sh
index 982db09..4ee3855 100755
--- a/scripts/batch-2d.sh
+++ b/scripts/batch-2d.sh
@@ -5,7 +5,7 @@ cmd="openscad"
 [ -x "./OpenSCAD.app/Contents/MacOS/OpenSCAD" ] && cmd="./OpenSCAD.app/Contents/MacOS/OpenSCAD"
 
 mkdir -p output
-for f in testdata/*.dxf; do
+for f in testdata/dxf/*.dxf; do
   echo `basename $f`
   cat > tmp.scad << EOF
   import_dxf("$f");
diff --git a/test-code/batch-cgal.sh b/test-code/batch-cgal.sh
new file mode 100755
index 0000000..ea587be
--- /dev/null
+++ b/test-code/batch-cgal.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+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
new file mode 100755
index 0000000..9db4fb5
--- /dev/null
+++ b/test-code/batch-dump.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+cmd="./dumptest"
+
+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/testdata/arc.dxf b/testdata/dxf/arc.dxf
index 58a5e20..58a5e20 100644
--- a/testdata/arc.dxf
+++ b/testdata/dxf/arc.dxf
diff --git a/testdata/circle-advanced.dxf b/testdata/dxf/circle-advanced.dxf
index 1ecde34..1ecde34 100644
--- a/testdata/circle-advanced.dxf
+++ b/testdata/dxf/circle-advanced.dxf
diff --git a/testdata/circle-double.dxf b/testdata/dxf/circle-double.dxf
index 410f8c0..410f8c0 100644
--- a/testdata/circle-double.dxf
+++ b/testdata/dxf/circle-double.dxf
diff --git a/testdata/circle-small.dxf b/testdata/dxf/circle-small.dxf
index 99c4d0d..99c4d0d 100644
--- a/testdata/circle-small.dxf
+++ b/testdata/dxf/circle-small.dxf
diff --git a/testdata/circle.dxf b/testdata/dxf/circle.dxf
index 4dbe7fd..4dbe7fd 100644
--- a/testdata/circle.dxf
+++ b/testdata/dxf/circle.dxf
diff --git a/testdata/ellipse-arc-rot.dxf b/testdata/dxf/ellipse-arc-rot.dxf
index f3c107d..f3c107d 100644
--- a/testdata/ellipse-arc-rot.dxf
+++ b/testdata/dxf/ellipse-arc-rot.dxf
diff --git a/testdata/ellipse-arc.dxf b/testdata/dxf/ellipse-arc.dxf
index cef2ba9..cef2ba9 100644
--- a/testdata/ellipse-arc.dxf
+++ b/testdata/dxf/ellipse-arc.dxf
diff --git a/testdata/ellipse-reverse.dxf b/testdata/dxf/ellipse-reverse.dxf
index e4a1187..e4a1187 100644
--- a/testdata/ellipse-reverse.dxf
+++ b/testdata/dxf/ellipse-reverse.dxf
diff --git a/testdata/ellipse-rot.dxf b/testdata/dxf/ellipse-rot.dxf
index dc6422a..dc6422a 100644
--- a/testdata/ellipse-rot.dxf
+++ b/testdata/dxf/ellipse-rot.dxf
diff --git a/testdata/ellipse.dxf b/testdata/dxf/ellipse.dxf
index ef12658..ef12658 100644
--- a/testdata/ellipse.dxf
+++ b/testdata/dxf/ellipse.dxf
diff --git a/testdata/lwpolyline-closed.dxf b/testdata/dxf/lwpolyline-closed.dxf
index 2537e52..2537e52 100644
--- a/testdata/lwpolyline-closed.dxf
+++ b/testdata/dxf/lwpolyline-closed.dxf
diff --git a/testdata/lwpolyline.dxf b/testdata/dxf/lwpolyline.dxf
index bc02c53..bc02c53 100644
--- a/testdata/lwpolyline.dxf
+++ b/testdata/dxf/lwpolyline.dxf
diff --git a/testdata/lwpolyline2.dxf b/testdata/dxf/lwpolyline2.dxf
index 600a962..600a962 100644
--- a/testdata/lwpolyline2.dxf
+++ b/testdata/dxf/lwpolyline2.dxf
diff --git a/testdata/polygon-concave-hole.dxf b/testdata/dxf/polygon-concave-hole.dxf
index 794bf89..794bf89 100644
--- a/testdata/polygon-concave-hole.dxf
+++ b/testdata/dxf/polygon-concave-hole.dxf
diff --git a/testdata/polygon-concave-simple.dxf b/testdata/dxf/polygon-concave-simple.dxf
index e0e6ee5..e0e6ee5 100644
--- a/testdata/polygon-concave-simple.dxf
+++ b/testdata/dxf/polygon-concave-simple.dxf
diff --git a/testdata/polygon-concave.dxf b/testdata/dxf/polygon-concave.dxf
index e9f1ee1..e9f1ee1 100644
--- a/testdata/polygon-concave.dxf
+++ b/testdata/dxf/polygon-concave.dxf
diff --git a/testdata/polygon-holes-touch.dxf b/testdata/dxf/polygon-holes-touch.dxf
index 5be00e2..5be00e2 100644
--- a/testdata/polygon-holes-touch.dxf
+++ b/testdata/dxf/polygon-holes-touch.dxf
diff --git a/testdata/polygon-intersect.dxf b/testdata/dxf/polygon-intersect.dxf
index 197cbab..197cbab 100644
--- a/testdata/polygon-intersect.dxf
+++ b/testdata/dxf/polygon-intersect.dxf
diff --git a/testdata/polygon-many-holes.dxf b/testdata/dxf/polygon-many-holes.dxf
index 65cb801..65cb801 100644
--- a/testdata/polygon-many-holes.dxf
+++ b/testdata/dxf/polygon-many-holes.dxf
diff --git a/testdata/polygon-mesh.dxf b/testdata/dxf/polygon-mesh.dxf
index 10228fb..10228fb 100644
--- a/testdata/polygon-mesh.dxf
+++ b/testdata/dxf/polygon-mesh.dxf
diff --git a/testdata/polygon-overlap.dxf b/testdata/dxf/polygon-overlap.dxf
index 93876bd..93876bd 100644
--- a/testdata/polygon-overlap.dxf
+++ b/testdata/dxf/polygon-overlap.dxf
diff --git a/testdata/polygon-riser.dxf b/testdata/dxf/polygon-riser.dxf
index 64cc986..64cc986 100644
--- a/testdata/polygon-riser.dxf
+++ b/testdata/dxf/polygon-riser.dxf
diff --git a/testdata/polygon-self-intersect.dxf b/testdata/dxf/polygon-self-intersect.dxf
index e9c20de..e9c20de 100644
--- a/testdata/polygon-self-intersect.dxf
+++ b/testdata/dxf/polygon-self-intersect.dxf
diff --git a/testdata/polygon8.dxf b/testdata/dxf/polygon8.dxf
index b170834..b170834 100644
--- a/testdata/polygon8.dxf
+++ b/testdata/dxf/polygon8.dxf
diff --git a/testdata/polygons.dxf b/testdata/dxf/polygons.dxf
index c1134ee..c1134ee 100644
--- a/testdata/polygons.dxf
+++ b/testdata/dxf/polygons.dxf
diff --git a/testdata/triangle-with-duplicate-vertex.dxf b/testdata/dxf/triangle-with-duplicate-vertex.dxf
index 52fb1e0..52fb1e0 100644
--- a/testdata/triangle-with-duplicate-vertex.dxf
+++ b/testdata/dxf/triangle-with-duplicate-vertex.dxf
diff --git a/testdata/dim-all.dxf b/testdata/scad/dim-all.dxf
index 6ae7610..6ae7610 100644
--- a/testdata/dim-all.dxf
+++ b/testdata/scad/dim-all.dxf
diff --git a/testdata/dim-all.scad b/testdata/scad/dim-all.scad
index 027fba5..027fba5 100644
--- a/testdata/dim-all.scad
+++ b/testdata/scad/dim-all.scad
diff --git a/testdata/null-polygons.dxf b/testdata/scad/null-polygons.dxf
index 390e42e..390e42e 100644
--- a/testdata/null-polygons.dxf
+++ b/testdata/scad/null-polygons.dxf
diff --git a/testdata/null-polygons.scad b/testdata/scad/null-polygons.scad
index d945325..d945325 100644
--- a/testdata/null-polygons.scad
+++ b/testdata/scad/null-polygons.scad
diff --git a/testdata/transform-insert.dxf b/testdata/scad/transform-insert.dxf
index 40064c2..40064c2 100644
--- a/testdata/transform-insert.dxf
+++ b/testdata/scad/transform-insert.dxf
diff --git a/testdata/transform-insert.scad b/testdata/scad/transform-insert.scad
index 1237bb2..1237bb2 100644
--- a/testdata/transform-insert.scad
+++ b/testdata/scad/transform-insert.scad