diff options
| author | Marius Kintel <marius@kintel.net> | 2012-07-07 20:02:51 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-07-07 20:02:51 (GMT) |
| commit | 0d619e5ac155e37c432d57062d8224a58c9d59ab (patch) | |
| tree | 10183df17cd4786ee1ef43b95c988fefd13ca990 /testdata | |
| parent | aa8aee623adc74cbfe87f9e92e30be4a9ed3a7c8 (diff) | |
| parent | b028b704e029a5161d3703efda35642a37c28cb6 (diff) | |
Merge branch 'master' into linear_extrude_argument
Diffstat (limited to 'testdata')
| -rw-r--r-- | testdata/scad/templates/import_dxf-tests-template.scad (renamed from testdata/scad/features/import_dxf-tests.scad) | 1 | ||||
| -rw-r--r-- | testdata/scad/templates/import_stl-tests-template.scad (renamed from testdata/scad/features/import_stl-tests.scad) | 1 | ||||
| -rw-r--r-- | testdata/scad/templates/include-tests-template.scad (renamed from testdata/scad/misc/include-tests-template.scad) | 0 | ||||
| -rw-r--r-- | testdata/scad/templates/use-tests-template.scad (renamed from testdata/scad/misc/use-tests-template.scad) | 0 |
4 files changed, 2 insertions, 0 deletions
diff --git a/testdata/scad/features/import_dxf-tests.scad b/testdata/scad/templates/import_dxf-tests-template.scad index 736f26e..f10dd06 100644 --- a/testdata/scad/features/import_dxf-tests.scad +++ b/testdata/scad/templates/import_dxf-tests-template.scad @@ -7,3 +7,4 @@ translate([-200,200,0]) import(file="../../dxf/multiple-layers.dxf", layer="0"); translate([0,200,0]) import(file="../../dxf/multiple-layers.dxf", layer="0"); translate([200,200,0]) import(file="../../dxf/multiple-layers.dxf", layer="noname"); translate([0,200,0]) import(file="../../dxf/multiple-layers.dxf", layer="Layer with a pretty long name including \\ \"special\" /'\\\\ characters"); +translate([200,0,0]) import(file="@CMAKE_SOURCE_DIR@/../testdata/dxf/polygons.dxf"); diff --git a/testdata/scad/features/import_stl-tests.scad b/testdata/scad/templates/import_stl-tests-template.scad index 7104078..685b868 100644 --- a/testdata/scad/features/import_stl-tests.scad +++ b/testdata/scad/templates/import_stl-tests-template.scad @@ -1,3 +1,4 @@ import_stl("import.stl"); translate([2,0,0]) import("import.stl"); translate([4,0,0]) import("import_bin.stl"); +translate([0,2,0]) import("@CMAKE_SOURCE_DIR@/../testdata/scad/features/import.stl"); diff --git a/testdata/scad/misc/include-tests-template.scad b/testdata/scad/templates/include-tests-template.scad index 43bda57..43bda57 100644 --- a/testdata/scad/misc/include-tests-template.scad +++ b/testdata/scad/templates/include-tests-template.scad diff --git a/testdata/scad/misc/use-tests-template.scad b/testdata/scad/templates/use-tests-template.scad index 24591f8..24591f8 100644 --- a/testdata/scad/misc/use-tests-template.scad +++ b/testdata/scad/templates/use-tests-template.scad |