[brlcad-commits] SF.net SVN: brlcad:[33711] brlcad/trunk/regress/mged

[<sta...@us...>]

Revision: 33711
          http://brlcad.svn.sourceforge.net/brlcad/?rev=33711&view=rev
Author:   starseeker
Date:     2009-02-08 05:44:57 +0000 (Sun, 08 Feb 2009)

Log Message:
-----------
OK, rework this one more time.  Make the mged logic .mged files, and put tcl specific stuff all in regression_resources.tcl.  Have mged.tcl assemble the .mged files and run the test - the way the logic is defined it's easy to run individual tests as well.

Modified Paths:
--------------
    brlcad/trunk/regress/mged/mged.tcl
    brlcad/trunk/regress/mged/regression_resources.tcl

Added Paths:
-----------
    brlcad/trunk/regress/mged/3ptarb.mged
    brlcad/trunk/regress/mged/arb.mged
    brlcad/trunk/regress/mged/build_region.mged
    brlcad/trunk/regress/mged/clone.mged
    brlcad/trunk/regress/mged/comb.mged
    brlcad/trunk/regress/mged/cp.mged
    brlcad/trunk/regress/mged/cpi.mged
    brlcad/trunk/regress/mged/g.mged
    brlcad/trunk/regress/mged/in.mged
    brlcad/trunk/regress/mged/make.mged
    brlcad/trunk/regress/mged/make_bb.mged
    brlcad/trunk/regress/mged/mirror.mged
    brlcad/trunk/regress/mged/mv.mged
    brlcad/trunk/regress/mged/mvall.mged
    brlcad/trunk/regress/mged/prefix.mged
    brlcad/trunk/regress/mged/r.mged

Removed Paths:
-------------
    brlcad/trunk/regress/mged/3ptarb.tcl
    brlcad/trunk/regress/mged/arb.tcl
    brlcad/trunk/regress/mged/build_region.tcl
    brlcad/trunk/regress/mged/clone.tcl
    brlcad/trunk/regress/mged/comb.tcl
    brlcad/trunk/regress/mged/cp.tcl
    brlcad/trunk/regress/mged/cpi.tcl
    brlcad/trunk/regress/mged/g.tcl
    brlcad/trunk/regress/mged/in.tcl
    brlcad/trunk/regress/mged/make.tcl
    brlcad/trunk/regress/mged/mirror.tcl
    brlcad/trunk/regress/mged/mv.tcl
    brlcad/trunk/regress/mged/mvall.tcl
    brlcad/trunk/regress/mged/prefix.tcl
    brlcad/trunk/regress/mged/r.tcl

Added: brlcad/trunk/regress/mged/3ptarb.mged
===================================================================
--- brlcad/trunk/regress/mged/3ptarb.mged	                        (rev 0)
+++ brlcad/trunk/regress/mged/3ptarb.mged	2009-02-08 05:44:57 UTC (rev 33711)
@@ -0,0 +1,7 @@
+source regression_resources.tcl
+
+puts "*** Testing '3ptarb' command ***"
+
+3ptarb 3ptarb_test.s 0 0 0 10 0 0 10 10 0 z 0 10 6
+
+puts "*** '3ptarb' testing completed ***"


Property changes on: brlcad/trunk/regress/mged/3ptarb.mged
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Deleted: brlcad/trunk/regress/mged/3ptarb.tcl
===================================================================
--- brlcad/trunk/regress/mged/3ptarb.tcl	2009-02-07 19:59:23 UTC (rev 33710)
+++ brlcad/trunk/regress/mged/3ptarb.tcl	2009-02-08 05:44:57 UTC (rev 33711)
@@ -1,9 +0,0 @@
-puts "*** Testing '3ptarb' command ***"
-
-if {![info exists make_primitives_list]} {  
-   source regression_resources.tcl
-}
-
-3ptarb 3ptarb_test.s 0 0 0 10 0 0 10 10 0 z 0 10 6
-
-puts "*** '3ptarb' testing completed ***\n"

Added: brlcad/trunk/regress/mged/arb.mged
===================================================================
--- brlcad/trunk/regress/mged/arb.mged	                        (rev 0)
+++ brlcad/trunk/regress/mged/arb.mged	2009-02-08 05:44:57 UTC (rev 33711)
@@ -0,0 +1,8 @@
+source regression_resources.tcl
+
+puts "*** Testing 'arb' command ***"
+
+arb arb_test1.s 30 3
+arb arb_test2.s 55 20
+
+puts "*** 'arb' testing completed ***"


Property changes on: brlcad/trunk/regress/mged/arb.mged
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Deleted: brlcad/trunk/regress/mged/arb.tcl
===================================================================
--- brlcad/trunk/regress/mged/arb.tcl	2009-02-07 19:59:23 UTC (rev 33710)
+++ brlcad/trunk/regress/mged/arb.tcl	2009-02-08 05:44:57 UTC (rev 33711)
@@ -1,10 +0,0 @@
-puts "*** Testing 'arb' command ***"
-
-if {![info exists make_primitives_list]} {  
-   source regression_resources.tcl
-}
-
-arb arb_test1.s 30 3
-arb arb_test2.s 55 20
-
-puts "*** 'arb' testing completed ***\n"

Added: brlcad/trunk/regress/mged/build_region.mged
===================================================================
--- brlcad/trunk/regress/mged/build_region.mged	                        (rev 0)
+++ brlcad/trunk/regress/mged/build_region.mged	2009-02-08 05:44:57 UTC (rev 33711)
@@ -0,0 +1,9 @@
+source regression_resources.tcl
+
+puts "*** Testing 'build_region' command ***"
+
+batch_insert build_region epa .s 0 15 1
+build_region build_region_epa 0 15
+build_region -a 42 build_region_epa 5 8
+
+puts "*** 'build_region' testing completed ***"


Property changes on: brlcad/trunk/regress/mged/build_region.mged
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Deleted: brlcad/trunk/regress/mged/build_region.tcl
===================================================================
--- brlcad/trunk/regress/mged/build_region.tcl	2009-02-07 19:59:23 UTC (rev 33710)
+++ brlcad/trunk/regress/mged/build_region.tcl	2009-02-08 05:44:57 UTC (rev 33711)
@@ -1,16 +0,0 @@
-puts "*** Testing 'build_region' command ***"
-
-if {![info exists make_primitives_list]} {  
-   source regression_resources.tcl
-}
-
-
-for {set i 1} {$i < 11} {incr i} {
-	in_epa build_region .s $i
-}
-
-build_region build_region_epa 0 15
-build_region -a 42 build_region_epa 5 8
-
-
-puts "*** 'build_region' testing completed ***\n"

Added: brlcad/trunk/regress/mged/clone.mged
===================================================================
--- brlcad/trunk/regress/mged/clone.mged	                        (rev 0)
+++ brlcad/trunk/regress/mged/clone.mged	2009-02-08 05:44:57 UTC (rev 33711)
@@ -0,0 +1,23 @@
+source regression_resources.tcl
+
+puts "*** Testing 'clone' command ***"
+
+in_eto clone _a
+clone -a 10 10 10 10 clone_eto_a.s
+cp clone_eto_a.s clone_eto_b.s
+clone -b 10 100 100 100 clone_eto_b.s
+g clone_eto_b.c clone_eto_b.s*
+cp clone_eto_b.s clone_eto_c.s
+clone -i 30 -m x 10 -n 1 clone_eto_c.s 
+g clone_eto_c.c clone_eto_c.s*
+cp clone_eto_c.s clone_eto_d.s
+clone -i 5 -p 30 30 30 -r 10 10 15 -n 20 clone_eto_d.s
+g clone_eto_d.c clone_eto_d.s*
+cp clone_eto_d.s clone_eto_e.s
+clone -i 11 -t 1 1 1 -n 20 clone_eto_e.s
+g clone_eto_e.c clone_eto_e.s*
+cp clone_eto_e.c clone_a.c
+clone -i 2 -p 5 0 10 -r 10 20 30 -n 20 clone_a.c
+g clone_comb.c clone_a.c*
+
+puts "*** 'clone' testing completed ***"


Property changes on: brlcad/trunk/regress/mged/clone.mged
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Deleted: brlcad/trunk/regress/mged/clone.tcl
===================================================================
--- brlcad/trunk/regress/mged/clone.tcl	2009-02-07 19:59:23 UTC (rev 33710)
+++ brlcad/trunk/regress/mged/clone.tcl	2009-02-08 05:44:57 UTC (rev 33711)
@@ -1,29 +0,0 @@
-puts "*** Testing 'clone' command ***"
-
-if {![info exists make_primitives_list]} {  
-   source regression_resources.tcl
-}
-
-in_eto clone _a
-clone -a 10 10 10 10 clone_eto_a.s
-build_region -a 1 clone_eto_a 0 1000
-cp clone_eto_a.s clone_eto_b.s
-clone -b 10 100 100 100 clone_eto_b.s
-build_region -a 2 clone_eto_b 0 1000
-cp clone_eto_b.s clone_eto_c.s
-clone -i 30 -m x 10 -n 1 clone_eto_c.s 
-build_region -a 3 clone_eto_c 0 30
-cp clone_eto_c.s clone_eto_d.s
-clone -i 5 -p 30 30 30 -r 10 10 15 -n 20 clone_eto_d.s
-build_region -a 4 clone_eto_d 0 100
-cp clone_eto_d.s clone_eto_e.s
-clone -i 11 -t 1 1 1 -n 20 clone_eto_e.s
-build_region -a 5 clone_eto_e 0 230
-cp clone_eto_e.r5 clone_a.c
-attr rm clone_a.c region
-clone -i 2 -p 5 0 10 -r 10 20 30 -n 20 clone_a.c
-for {set i 2} {$i < 22} {incr i} {
-   g clone_comb.c clone_a.c$i
-}
-
-puts "*** 'clone' testing completed ***\n"

Added: brlcad/trunk/regress/mged/comb.mged
===================================================================
--- brlcad/trunk/regress/mged/comb.mged	                        (rev 0)
+++ brlcad/trunk/regress/mged/comb.mged	2009-02-08 05:44:57 UTC (rev 33711)
@@ -0,0 +1,15 @@
+source regression_resources.tcl
+
+puts "*** Testing 'comb' command ***"
+
+in_sph comb 1
+in_sph comb 2
+in_sph comb 3
+comb comb1.c u comb_sph1.s u comb_sph2.s u comb_sph3.s
+comb comb2.c u comb_sph1.s + comb_sph2.s + comb_sph3.s
+comb comb3.c u comb_sph3.s - comb_sph2.s - comb_sph1.s
+comb comb4.c u comb_sph2.s - comb_sph1.s + comb_sph3.s
+comb comb5.c u comb_sph2.s - comb_sph1.s + comb_sph3.s
+comb comb6.c u comb2.c + comb1.c u comb3.c u comb4.c - comb5.c
+
+puts "*** 'comb' testing completed ***"


Property changes on: brlcad/trunk/regress/mged/comb.mged
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Deleted: brlcad/trunk/regress/mged/comb.tcl
===================================================================
--- brlcad/trunk/regress/mged/comb.tcl	2009-02-07 19:59:23 UTC (rev 33710)
+++ brlcad/trunk/regress/mged/comb.tcl	2009-02-08 05:44:57 UTC (rev 33711)
@@ -1,17 +0,0 @@
-puts "*** Testing 'comb' command ***"
-
-if {![info exists make_primitives_list]} {  
-   source regression_resources.tcl
-}
-
-in_sph comb 1
-in_sph comb 2
-in_sph comb 3
-comb comb1.c u comb_sph1.s u comb_sph2.s u comb_sph3.s
-comb comb2.c u comb_sph1.s + comb_sph2.s + comb_sph3.s
-comb comb3.c u comb_sph3.s - comb_sph2.s - comb_sph1.s
-comb comb4.c u comb_sph2.s - comb_sph1.s + comb_sph3.s
-comb comb5.c u comb_sph2.s - comb_sph1.s + comb_sph3.s
-comb comb6.c u comb2.c + comb1.c u comb3.c u comb4.c - comb5.c
-
-puts "*** 'comb' testing completed ***\n"

Added: brlcad/trunk/regress/mged/cp.mged
===================================================================
--- brlcad/trunk/regress/mged/cp.mged	                        (rev 0)
+++ brlcad/trunk/regress/mged/cp.mged	2009-02-08 05:44:57 UTC (rev 33711)
@@ -0,0 +1,10 @@
+source regression_resources.tcl
+
+puts "*** Testing 'cp' command ***"
+
+in_sph cp 
+comb cp_comb.c u cp_sph.s
+cp cp_sph.s cp_copy_sph.s
+cp cp_comb.c cp_copy_comb.c
+
+puts "*** 'cp' testing completed ***"


Property changes on: brlcad/trunk/regress/mged/cp.mged
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Deleted: brlcad/trunk/regress/mged/cp.tcl
===================================================================
--- brlcad/trunk/regress/mged/cp.tcl	2009-02-07 19:59:23 UTC (rev 33710)
+++ brlcad/trunk/regress/mged/cp.tcl	2009-02-08 05:44:57 UTC (rev 33711)
@@ -1,12 +0,0 @@
-puts "*** Testing 'cp' command ***"
-
-if {![info exists make_primitives_list]} {  
-   source regression_resources.tcl
-}
-
-in_sph cp 
-comb cp_comb.c u cp_sph.s
-cp cp_sph.s cp_copy_sph.s
-cp cp_comb.c cp_copy_comb.c
-
-puts "*** 'cp' testing completed ***\n"

Added: brlcad/trunk/regress/mged/cpi.mged
===================================================================
--- brlcad/trunk/regress/mged/cpi.mged	                        (rev 0)
+++ brlcad/trunk/regress/mged/cpi.mged	2009-02-08 05:44:57 UTC (rev 33711)
@@ -0,0 +1,9 @@
+source regression_resources.tcl
+
+puts "*** Testing 'cpi' command ***"
+
+in cpi-base-cyl.s rcc 1 2 3 10 10 10 3.5
+cpi cpi-base-cyl.s cpi-cyl.s
+accept
+
+puts "*** 'cpi' testing completed ***"


Property changes on: brlcad/trunk/regress/mged/cpi.mged
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Deleted: brlcad/trunk/regress/mged/cpi.tcl
===================================================================
--- brlcad/trunk/regress/mged/cpi.tcl	2009-02-07 19:59:23 UTC (rev 33710)
+++ brlcad/trunk/regress/mged/cpi.tcl	2009-02-08 05:44:57 UTC (rev 33711)
@@ -1,11 +0,0 @@
-puts "*** Testing 'cpi' command ***"
-
-if {![info exists make_primitives_list]} {  
-   source regression_resources.tcl
-}
-
-in cpi-base-cyl.s rcc 1 2 3 10 10 10 3.5
-cpi cpi-base-cyl.s cpi-cyl.s
-accept
-
-puts "*** 'cpi' testing completed ***\n"

Added: brlcad/trunk/regress/mged/g.mged
===================================================================
--- brlcad/trunk/regress/mged/g.mged	                        (rev 0)
+++ brlcad/trunk/regress/mged/g.mged	2009-02-08 05:44:57 UTC (rev 33711)
@@ -0,0 +1,12 @@
+source regression_resources.tcl
+
+puts "*** Testing 'g' command ***"
+
+in_sph g 1
+in_sph g 2
+in_sph g 3
+comb g_comb1.c u g_sph1.s u g_sph2.s u g_sph3.s
+g g1.c g_sph1.s g_sph2.s g_sph3.s
+g g2.c g_sph1.s g_sph2.s g_comb1.c
+
+puts "*** 'g' testing completed ***"


Property changes on: brlcad/trunk/regress/mged/g.mged
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Deleted: brlcad/trunk/regress/mged/g.tcl
===================================================================
--- brlcad/trunk/regress/mged/g.tcl	2009-02-07 19:59:23 UTC (rev 33710)
+++ brlcad/trunk/regress/mged/g.tcl	2009-02-08 05:44:57 UTC (rev 33711)
@@ -1,14 +0,0 @@
-puts "*** Testing 'g' command ***"
-
-if {![info exists make_primitives_list]} {  
-   source regression_resources.tcl
-}
-
-in_sph comb 1
-in_sph comb 2
-in_sph comb 3
-comb g_comb1.c u comb_sph1.s u comb_sph2.s u comb_sph3.s
-g g1.c g_sph1.s g_sph2.s g_sph3.s
-g g2.c g_sph1.s g_sph2.s g_comb1.c
-
-puts "*** 'g' testing completed ***\n"

Added: brlcad/trunk/regress/mged/in.mged
===================================================================
--- brlcad/trunk/regress/mged/in.mged	                        (rev 0)
+++ brlcad/trunk/regress/mged/in.mged	2009-02-08 05:44:57 UTC (rev 33711)
@@ -0,0 +1,7 @@
+source regression_resources.tcl
+
+puts "*** Testing 'in' command ***"
+
+in_all_prims in
+
+puts "*** 'in' testing completed ***\n"


Property changes on: brlcad/trunk/regress/mged/in.mged
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Deleted: brlcad/trunk/regress/mged/in.tcl
===================================================================
--- brlcad/trunk/regress/mged/in.tcl	2009-02-07 19:59:23 UTC (rev 33710)
+++ brlcad/trunk/regress/mged/in.tcl	2009-02-08 05:44:57 UTC (rev 33711)
@@ -1,19 +0,0 @@
-puts "*** Testing 'in' command ***"
-
-# Load regression testing common definitions if
-# not already loaded
-if {![info exists make_primitives_list]} {
-   source regression_resources.tcl
-}
-
-# Now, run the pre-defined in routines for all primitives.
-# Avoid making extrude in the list iteration, as it needs 
-# a specific pre-existing sketch first
-foreach x $make_primitives_list {
-     if {![string match "extrude" $x] } { in_$x in }
-}
-
-# Special commands to handle the extrude primitive
-in_sketch
-in_extrude in
-puts "*** 'in' testing completed ***\n"

Added: brlcad/trunk/regress/mged/make.mged
===================================================================
--- brlcad/trunk/regress/mged/make.mged	                        (rev 0)
+++ brlcad/trunk/regress/mged/make.mged	2009-02-08 05:44:57 UTC (rev 33711)
@@ -0,0 +1,8 @@
+source regression_resources.tcl
+
+puts "*** Testing 'make' command ***"
+
+make_all_prims make -1 
+make_all_prims make 42 sized_
+
+puts "*** 'make' testing completed ***"


Property changes on: brlcad/trunk/regress/mged/make.mged
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Deleted: brlcad/trunk/regress/mged/make.tcl
===================================================================
--- brlcad/trunk/regress/mged/make.tcl	2009-02-07 19:59:23 UTC (rev 33710)
+++ brlcad/trunk/regress/mged/make.tcl	2009-02-08 05:44:57 UTC (rev 33711)
@@ -1,14 +0,0 @@
-puts "*** Testing 'make' command ***"
-
-if {![info exists make_primitives_list]} {  
-   source regression_resources.tcl
-}
-
-foreach x $make_primitives_list {
-	make [format make_%s.s $x] $x
-	make -s 42 [format make_sized_%s.s $x] $x
-}
-
-set make_regression_run 1
-
-puts "*** 'make' testing completed ***\n"

Added: brlcad/trunk/regress/mged/make_bb.mged
===================================================================
--- brlcad/trunk/regress/mged/make_bb.mged	                        (rev 0)
+++ brlcad/trunk/regress/mged/make_bb.mged	2009-02-08 05:44:57 UTC (rev 33711)
@@ -0,0 +1,24 @@
+source regression_resources.tcl
+
+puts "*** Testing 'make_bb' command ***"
+
+in_all_prims make_bb
+
+# Specialized command for make_bb in regression_resources
+# written for regression testing
+make_bb_all
+
+comb bb_prim1.c u make_bb_arb4.s u make_bb_arb5.s u make_bb_arb6.s u make_bb_arb7.s u make_bb_arb8.s u make_bb_arbn.s
+make_bb comb_bb1.s bb_prim1.c
+comb bb_prim2.c u make_bb_ars.s u make_bb_bot.s u make_bb_ehy.s u make_bb_ell.s u make_bb_ell1.s u make_bb_epa.s
+make_bb comb_bb2.s bb_prim2.c
+comb bb_prim3.c u make_bb_eto.s u make_bb_extrude.s u make_bb_grip.s u make_bb_nmg.s u make_bb_part.s u make_bb_pipe.s
+make_bb comb_bb3.s bb_prim3.c
+comb bb_prim4.c u make_bb_rcc.s u make_bb_rec.s u make_bb_rhc.s u make_bb_rpc.s u make_bb_rpp.s
+make_bb comb_bb4.s bb_prim4.c
+comb bb_prim5.c u make_bb_sketch.s u make_bb_sph.s u make_bb_tec.s u make_bb_tgc.s u make_bb_tor.s u make_bb_trc.s
+make_bb comb_bb5.s bb_prim5.c 
+comb bb_all.c u bb_prim1.c u bb_prim2.c u bb_prim3.c u bb_prim4.c u bb_prim5.c
+make_bb bb_all.s bb_all.c
+
+puts "*** 'make_bb' testing completed ***"


Property changes on: brlcad/trunk/regress/mged/make_bb.mged
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Modified: brlcad/trunk/regress/mged/mged.tcl
===================================================================
--- brlcad/trunk/regress/mged/mged.tcl	2009-02-07 19:59:23 UTC (rev 33710)
+++ brlcad/trunk/regress/mged/mged.tcl	2009-02-08 05:44:57 UTC (rev 33711)
@@ -31,35 +31,51 @@
 #
 #	SETUP
 
-set MGED_CMD /Users/cyapp/brlcad-install/bin/mged
+set MGED_CMD /usr/brlcad/bin/mged
 
-file delete mged.g mged.log
+file delete mged.g mged.log mged.mged
 
+proc add_test {cmdname} {
+     set mgedfile [open mged.mged a]
+     set testfile [open [format %s.mged $cmdname] r]
+     while {[gets $testfile line] >= 0} {
+        puts $mgedfile $line
+     }
+     close $mgedfile
+     close $testfile
+}
+
 proc run_test {cmdname} {
      global MGED_CMD
-     exec $MGED_CMD -c mged.g source [format %s.tcl $cmdname] >>& mged.log
+     exec $MGED_CMD -c [format %s.g $cmdname] < [format %s.mged $cmdname] >>& [format %s.log $cmdname]
 }
 
 #
 #	GEOMETRIC INPUT COMMANDS
 #
-run_test in
-run_test make
-run_test 3ptarb
-run_test arb
-run_test comb
-run_test g
-run_test r
-run_test make_bb
-run_test cp
-run_test cpi
-run_test mv
-run_test mvall
-run_test build_region
-run_test clone
-run_test prefix
-run_test mirror
+add_test in
+add_test make
+add_test 3ptarb
+add_test arb
+add_test comb
+add_test g
+add_test r
+add_test make_bb
+add_test cp
+add_test cpi
+add_test mv
+add_test mvall
+add_test build_region
+add_test clone
+add_test prefix
+add_test mirror
 
 #
 #	DISPLAYING GEOMETRY - COMMANDS
 #
+
+
+
+
+
+run_test mged

Added: brlcad/trunk/regress/mged/mirror.mged
===================================================================
--- brlcad/trunk/regress/mged/mirror.mged	                        (rev 0)
+++ brlcad/trunk/regress/mged/mirror.mged	2009-02-08 05:44:57 UTC (rev 33711)
@@ -0,0 +1,14 @@
+source regression_resources.tcl
+
+puts "*** Testing 'mirror' command ***"
+
+in_eto mirror 1
+in mirror_eto2.s eto -10 0 0 -1 -1 -1 20 0 3 3 2.5
+comb mirror1.c u mirror_eto1.s u mirror_eto2.s
+mirror -d {1 1 1} -p 100 mirror1.c mirror2.c
+mirror -d {1 1 4} -o {3 2 2} -p 30 mirror1.c mirror3.c
+mirror -x mirror1.c mirror4.c
+mirror -y mirror1.c mirror5.c
+mirror -z mirror1.c mirror6.c
+
+puts "*** 'mirror' testing completed ***"


Property changes on: brlcad/trunk/regress/mged/mirror.mged
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Deleted: brlcad/trunk/regress/mged/mirror.tcl
===================================================================
--- brlcad/trunk/regress/mged/mirror.tcl	2009-02-07 19:59:23 UTC (rev 33710)
+++ brlcad/trunk/regress/mged/mirror.tcl	2009-02-08 05:44:57 UTC (rev 33711)
@@ -1,16 +0,0 @@
-puts "*** Testing 'mirror' command ***"
-
-if {![info exists make_primitives_list]} {  
-   source regression_resources.tcl
-}
-
-in_eto mirror 1
-in mirror_eto2.s eto -10 0 0 -1 -1 -1 20 0 3 3 2.5
-comb mirror1.c u mirror_eto1.s u mirror_eto2.s
-mirror -d {1 1 1} -p 100 mirror1.c mirror2.c
-mirror -d {1 1 4} -o {3 2 2} -p 30 mirror1.c mirror3.c
-mirror -x mirror1.c mirror4.c
-mirror -y mirror1.c mirror5.c
-mirror -z mirror1.c mirror6.c
-
-puts "*** 'mirror' testing completed ***\n"

Added: brlcad/trunk/regress/mged/mv.mged
===================================================================
--- brlcad/trunk/regress/mged/mv.mged	                        (rev 0)
+++ brlcad/trunk/regress/mged/mv.mged	2009-02-08 05:44:57 UTC (rev 33711)
@@ -0,0 +1,11 @@
+source regression_resources.tcl
+
+puts "*** Testing 'mv' command ***"
+
+in_sph mv 1
+in_sph mv 2
+comb mv_comb.c u mv_sph2.s
+mv mv_sph1.s moved_sph1.s
+mv mv_comb.c moved_comb.c
+
+puts "*** 'mv' testing completed ***"


Property changes on: brlcad/trunk/regress/mged/mv.mged
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Deleted: brlcad/trunk/regress/mged/mv.tcl
===================================================================
--- brlcad/trunk/regress/mged/mv.tcl	2009-02-07 19:59:23 UTC (rev 33710)
+++ brlcad/trunk/regress/mged/mv.tcl	2009-02-08 05:44:57 UTC (rev 33711)
@@ -1,13 +0,0 @@
-puts "*** Testing 'mv' command ***"
-
-if {![info exists make_primitives_list]} {  
-   source regression_resources.tcl
-}
-
-in_sph mv 1
-in_sph mv 2
-comb mv_comb.c u mv_sph2.s
-mv mv_sph.s moved_sph.s
-mv mv_comb.c moved_comb.c
-
-puts "*** 'mv' testing completed ***\n"

Added: brlcad/trunk/regress/mged/mvall.mged
===================================================================
--- brlcad/trunk/regress/mged/mvall.mged	                        (rev 0)
+++ brlcad/trunk/regress/mged/mvall.mged	2009-02-08 05:44:57 UTC (rev 33711)
@@ -0,0 +1,13 @@
+source regression_resources.tcl
+
+puts "*** Testing 'mvall' command ***"
+
+in_sph mvall 1
+in_sph mvall 2
+comb mvall_comb_1.c u mvall_sph2.s
+comb moved_all_comb_2.c u mvall_sph2.s
+mvall mvall_sph1.s moved_all_sph.s
+mvall mvall_comb_1.c moved_all_comb1.c
+mvall mvall_sph2.s moved_all_comb_sph.s
+
+puts "*** 'mvall' testing completed ***"


Property changes on: brlcad/trunk/regress/mged/mvall.mged
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Deleted: brlcad/trunk/regress/mged/mvall.tcl
===================================================================
--- brlcad/trunk/regress/mged/mvall.tcl	2009-02-07 19:59:23 UTC (rev 33710)
+++ brlcad/trunk/regress/mged/mvall.tcl	2009-02-08 05:44:57 UTC (rev 33711)
@@ -1,15 +0,0 @@
-puts "*** Testing 'mvall' command ***"
-
-if {![info exists make_primitives_list]} {  
-   source regression_resources.tcl
-}
-
-in_sph mvall 1
-in_sph mvall 2
-comb mvall_comb_1.c u mvall_sph2.s
-comb moved_all_comb_2.c u mvall_sph2.s
-mvall mvall_sph1.s moved_all_sph.s
-mvall mvall_comb_1.c moved_all_comb1.c
-mvall mvall_sph2.s moved_all_comb_sph.s
-
-puts "*** 'mvall' testing completed ***\n"

Added: brlcad/trunk/regress/mged/prefix.mged
===================================================================
--- brlcad/trunk/regress/mged/prefix.mged	                        (rev 0)
+++ brlcad/trunk/regress/mged/prefix.mged	2009-02-08 05:44:57 UTC (rev 33711)
@@ -0,0 +1,10 @@
+source regression_resources.tcl
+
+puts "*** Testing 'prefix' command ***"
+
+in_sph prefix 1
+in_sph prefix 2
+comb prefix_comb.c u prefix_sph1.s u prefix_sph2.s
+prefix has_ prefix*
+
+puts "*** 'prefix' testing completed ***"


Property changes on: brlcad/trunk/regress/mged/prefix.mged
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Deleted: brlcad/trunk/regress/mged/prefix.tcl
===================================================================
--- brlcad/trunk/regress/mged/prefix.tcl	2009-02-07 19:59:23 UTC (rev 33710)
+++ brlcad/trunk/regress/mged/prefix.tcl	2009-02-08 05:44:57 UTC (rev 33711)
@@ -1,14 +0,0 @@
-puts "*** Testing 'prefix' command ***"
-
-if {![info exists make_primitives_list]} {  
-   source regression_resources.tcl
-}
-
-in_sph prefix 1
-in_sph prefix 2
-comb prefix_comb.c u prefix_sph1.s u prefix_sph2.s
-prefix has_ prefix_sph1.s
-prefix has_ prefix_sph2.s
-prefix has_ prefix_comb.c
-
-puts "*** 'prefix' testing completed ***\n"

Added: brlcad/trunk/regress/mged/r.mged
===================================================================
--- brlcad/trunk/regress/mged/r.mged	                        (rev 0)
+++ brlcad/trunk/regress/mged/r.mged	2009-02-08 05:44:57 UTC (rev 33711)
@@ -0,0 +1,14 @@
+source regression_resources.tcl
+
+puts "*** Testing 'r' command ***"
+
+in_sph r 1
+in_sph r 2
+in_sph r 3
+comb r_comb1.c u r_sph1.s u r_sph2.s u r_sph3.s
+comb r_comb2.c u r_sph1.s + r_sph2.s + r_sph3.s
+r r1.r u r_sph1.s u r_sph2.s u r_sph3.s
+r r2.r u r_sph1.s u r_comb1.c
+r r3.r u r_comb1.c u r_comb2.c
+
+puts "*** 'r' testing completed ***"


Property changes on: brlcad/trunk/regress/mged/r.mged
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Deleted: brlcad/trunk/regress/mged/r.tcl
===================================================================
--- brlcad/trunk/regress/mged/r.tcl	2009-02-07 19:59:23 UTC (rev 33710)
+++ brlcad/trunk/regress/mged/r.tcl	2009-02-08 05:44:57 UTC (rev 33711)
@@ -1,16 +0,0 @@
-puts "*** Testing 'r' command ***"
-
-if {![info exists make_primitives_list]} {  
-   source regression_resources.tcl
-}
-
-in_sph r 1
-in_sph r 2
-in_sph r 3
-comb r_comb1.c u r_sph1.s u r_sph2.s u r_sph3.s
-comb r_comb2.c u r_sph1.s + r_sph2.s + r_sph3.s
-r r1.r u r_sph1.s u r_sph2.s u r_sph3.s
-r r2.r u r_sph1.s u r_comb1.c
-r r3.r u r_comb1.c u r_comb2.c
-
-puts "*** 'r' testing completed ***\n"

Modified: brlcad/trunk/regress/mged/regression_resources.tcl
===================================================================
--- brlcad/trunk/regress/mged/regression_resources.tcl	2009-02-07 19:59:23 UTC (rev 33710)
+++ brlcad/trunk/regress/mged/regression_resources.tcl	2009-02-08 05:44:57 UTC (rev 33711)
@@ -1,46 +1,130 @@
-# A complete list of the primitives to be tested in regression
-set make_primitives_list {arb4 arb5 arb6 arb7 arb8 arbn ars bot ehy ell ell1 epa eto extrude grip half hyp nmg part pipe rcc rec rhc rpc rpp sketch sph tec tgc tor trc}
+# This file needs to be run only once per series of commands, but
+# with command tests broken into individual files each file might
+# need to run it.  To avoid the problem, the entire file contents
+# will be wrapped in a conditional check - this means the file can
+# be safely sourced multiple times without re-executing the file
+# contents
 
-# Because it will frequently be necessary to insert primitives
-# with explicit value settings (to avoid tests failing due to
-# changes in make behavior, for example) for each primitive type
-# an explicit in_<primitive> command will be defined that will
-# take an argument to be used to generate its name and (optionally)
-# a middle string to insert and a custom extension.
-proc in_arb4 {cmdname {mid_str ""} {extension ".s"}} {in [format %s_arb4%s%s $cmdname $mid_str $extension] arb4 3 -3 -3 3 0 -3 3 0 0 0 0 -3 }
+if {![info exists make_primitives_list]} {
 
-proc in_arb5 {cmdname {mid_str ""} {extension ".s"}} {in [format %s_arb5%s%s $cmdname $mid_str $extension] arb5 1 0 0 1 2 0 3 2 0 3 0 0 1.5 1.5 5 }
-proc in_arb6 {cmdname {mid_str ""} {extension ".s"}} {in [format %s_arb6%s%s $cmdname $mid_str $extension] arb6 2 -.5 -.5 2 0 -.5 2 0 0 2 -.5 0 2.5 -.3 -.5 2.5 -.3 0 }
-proc in_arb7 {cmdname {mid_str ""} {extension ".s"}} {in [format %s_arb7%s%s $cmdname $mid_str $extension] arb7 3.25 -1.25 -0.75 3.25 -0.25 -0.75 3.25 -0.25 0.25 3.25 -1.25 -0.25 2.25 -1.25 -0.75 2.25 -0.25 -0.75 2.25 -0.25 -0.25 }
-proc in_arb8 {cmdname {mid_str ""} {extension ".s"}} {in [format %s_arb8%s%s $cmdname $mid_str $extension] arb8 10 -9 -8 10 -1 -8 10 -1 0 10 -9 0 3 -9 -8 3 -1 -8 3 -1 0 3 -9 0 }
-proc in_arbn {cmdname {mid_str ""} {extension ".s"}} {in [format %s_arbn%s%s $cmdname $mid_str $extension] arbn 8 1 0 0 1000 -1 0 0 1000 0 1 0 1000 0 -1 0 1000 0 0 1 1000 0 0 -1 1000 0.57735 0.57735 0.57735 1000 -0.57735 -0.57735 -0.57735 200 }
-proc in_ars {cmdname {mid_str ""} {extension ".s"}} {in [format %s_ars%s%s $cmdname $mid_str $extension] ars 3 3 0 0 0 0 0 100 100 0 100 100 100 100 0 0 200 }
-proc in_bot {cmdname {mid_str ""} {extension ".s"}} {in [format %s_bot%s%s $cmdname $mid_str $extension] bot 4 4 2 1 0 0 0 10 10 0 -10 10 0 0 10 10 0 1 2 1 2 3 3 2 0 0 3 1 }
-proc in_ehy {cmdname {mid_str ""} {extension ".s"}} {in [format %s_ehy%s%s $cmdname $mid_str $extension] ehy 0 0 0 0 10 10 10 0 0 10 3 }
-proc in_ell {cmdname {mid_str ""} {extension ".s"}} {in [format %s_ell%s%s $cmdname $mid_str $extension] ell 10 0 0 -12 0 0 0 -3 0 0 0 5 } 
-proc in_ell1 {cmdname {mid_str ""} {extension ".s"}} {in [format %s_ell1%s%s $cmdname $mid_str $extension] ell1 3 2 8 3 -1 8 4 }
-proc in_epa {cmdname {mid_str ""} {extension ".s"}} {in [format %s_epa%s%s $cmdname $mid_str $extension] epa 0 0 0 3 0 0 0 5 0 3 } 
-proc in_eto {cmdname {mid_str ""} {extension ".s"}} {in [format %s_eto%s%s $cmdname $mid_str $extension] eto 0 0 0 1 1 1 10 0 2 2 1.5 }
-proc in_grip {cmdname {mid_str ""} {extension ".s"}} {in [format %s_grip%s%s $cmdname $mid_str $extension] grip 0 0 0 3 0 0 6 }
-proc in_half {cmdname {mid_str ""} {extension ".s"}} {in [format %s_half%s%s $cmdname $mid_str $extension] half 1 1 1 5 }
-proc in_hyp {cmdname {mid_str ""} {extension ".s"}} {in [format %s_hyp%s%s $cmdname $mid_str $extension] hyp 0 0 0 0 0 10 3 0 0 4 .3 }
-proc in_part {cmdname {mid_str ""} {extension ".s"}} {in [format %s_part%s%s $cmdname $mid_str $extension] part 0 0 0 0 0 16 4 2 }
-proc in_pipe {cmdname {mid_str ""} {extension ".s"}} {in [format %s_pipe%s%s $cmdname $mid_str $extension] pipe 4 0 0 0 3 5 6 0 0 3 3 5 7 3 4 8 2 6 10 8 8 10 0 6 8 }
-proc in_rcc {cmdname {mid_str ""} {extension ".s"}} {in [format %s_rcc%s%s $cmdname $mid_str $extension] rcc 0 0 0 3 3 30 7 }
-proc in_rec {cmdname {mid_str ""} {extension ".s"}} {in [format %s_rec%s%s $cmdname $mid_str $extension] rec 0 0 0 3 3 10 10 0 0 0 3 0 }
-proc in_rhc {cmdname {mid_str ""} {extension ".s"}} {in [format %s_rhc%s%s $cmdname $mid_str $extension] rhc 0 0 0 0 0 10 3 0 0 4 3 }
-proc in_rpc {cmdname {mid_str ""} {extension ".s"}} {in [format %s_rpc%s%s $cmdname $mid_str $extension] rpc 0 0 0 0 0 4 0 1 0 3 }
-proc in_rpp {cmdname {mid_str ""} {extension ".s"}} {in [format %s_rpp%s%s $cmdname $mid_str $extension] rpp 0 30 -3 12 -1 22 }
-proc in_sph {cmdname {mid_str ""} {extension ".s"}} {in [format %s_sph%s%s $cmdname $mid_str $extension] sph 42 42 42 42 }
-proc in_tec {cmdname {mid_str ""} {extension ".s"}} {in [format %s_tec%s%s $cmdname $mid_str $extension] tec 0 0 0 0 0 10 5 0 0 0 3 0 .6 }
-proc in_tgc {cmdname {mid_str ""} {extension ".s"}} {in [format %s_tgc%s%s $cmdname $mid_str $extension] tgc 0 0 0 0 0 10 5 0 0 0 8 0 2 9 }
-proc in_tor {cmdname {mid_str ""} {extension ".s"}} {in [format %s_tor%s%s $cmdname $mid_str $extension] tor 0 0 0 1 1 3 5 2 }
-proc in_trc {cmdname {mid_str ""} {extension ".s"}} {in [format %s_trc%s%s $cmdname $mid_str $extension] trc 0 0 0 0 0 10 4 7 }
+  # A complete list of the primitives to be tested in regression
+  set make_primitives_list {arb4 arb5 arb6 arb7 arb8 arbn ars bot ehy ell ell1 epa eto extrude grip half hyp nmg part pipe rcc rec rhc rpc rpp sketch sph tec tgc tor trc}
 
-proc in_nmg {cmdname {mid_str ""} {extension ".s"}} {}
+  # A convenience routine is defined for cases where one wants to
+  # make an instance of each primitive.
 
-proc in_sketch {{cmdname "extrude"} {mid_str ""} {extension ""}} {put [format {%s_sketch%s%s} $cmdname $mid_str $extension] sketch V {10 20 30} A {1 0 0} B {0 1 0} VL { {250 0} {500 0} {500 500} {0 500} {0 250} {250 250} {125 125} {0 125} {125 0} {200 200} } SL { { bezier D 4 P { 4 7 9 8 0 } } { line S 0 E 1 } { line S 1 E 2 } { line S 2 E 3 } { line S 3 E 4 } { carc S 6 E 5 R -1 L 0 O 0 } }}
+  proc make_all_prims {cmdname {size "-1"} {extratext1 ""} {extratext2 ""} } {
+     global make_primitives_list
+     foreach x $make_primitives_list {
+        if {$size == -1} {
+	  make [format %s_%s%s.s%s $cmdname $extratext1 $x $extratext2] $x
+	} else {
+	  make -s $size [format %s_%s%s.s%s $cmdname $extratext1 $x $extratext2] $x
+	}
+     }
+  }
 
-proc in_extrude {cmdname {mid_str ""} {extension ".s"} {sketch "extrude_sketch"}} { in [format %s_extrude%s%s $cmdname $mid_str $extension] extrude 0 0 0 0 0 1000 10 0 0 0 10 0 $sketch} 
+  # Because it will frequently be necessary to insert primitives
+  # with explicit value settings (to avoid tests failing due to
+  # changes in make behavior, for example) for each primitive type
+  # an explicit in_<primitive> command will be defined that will
+  # take an argument to be used to generate its name and (optionally)
+  # a middle string to insert and a custom extension.
+  proc in_arb4 {cmdname {mid_str ""} {extension ".s"}} {in [format %s_arb4%s%s $cmdname $mid_str $extension] arb4 3 -3 -3 3 0 -3 3 0 0 0 0 -3 }
 
-puts "Regression testing definitions loaded.\n"
+  proc in_arb5 {cmdname {mid_str ""} {extension ".s"}} {in [format %s_arb5%s%s $cmdname $mid_str $extension] arb5 1 0 0 1 2 0 3 2 0 3 0 0 1.5 1.5 5 }
+  proc in_arb6 {cmdname {mid_str ""} {extension ".s"}} {in [format %s_arb6%s%s $cmdname $mid_str $extension] arb6 2 -.5 -.5 2 0 -.5 2 0 0 2 -.5 0 2.5 -.3 -.5 2.5 -.3 0 }
+  proc in_arb7 {cmdname {mid_str ""} {extension ".s"}} {in [format %s_arb7%s%s $cmdname $mid_str $extension] arb7 3.25 -1.25 -0.75 3.25 -0.25 -0.75 3.25 -0.25 0.25 3.25 -1.25 -0.25 2.25 -1.25 -0.75 2.25 -0.25 -0.75 2.25 -0.25 -0.25 }
+  proc in_arb8 {cmdname {mid_str ""} {extension ".s"}} {in [format %s_arb8%s%s $cmdname $mid_str $extension] arb8 10 -9 -8 10 -1 -8 10 -1 0 10 -9 0 3 -9 -8 3 -1 -8 3 -1 0 3 -9 0 }
+  proc in_arbn {cmdname {mid_str ""} {extension ".s"}} {in [format %s_arbn%s%s $cmdname $mid_str $extension] arbn 8 1 0 0 1000 -1 0 0 1000 0 1 0 1000 0 -1 0 1000 0 0 1 1000 0 0 -1 1000 0.57735 0.57735 0.57735 1000 -0.57735 -0.57735 -0.57735 200 }
+  proc in_ars {cmdname {mid_str ""} {extension ".s"}} {in [format %s_ars%s%s $cmdname $mid_str $extension] ars 3 3 0 0 0 0 0 100 100 0 100 100 100 100 0 0 200 }
+  proc in_bot {cmdname {mid_str ""} {extension ".s"}} {in [format %s_bot%s%s $cmdname $mid_str $extension] bot 4 4 2 1 0 0 0 10 10 0 -10 10 0 0 10 10 0 1 2 1 2 3 3 2 0 0 3 1 }
+  proc in_ehy {cmdname {mid_str ""} {extension ".s"}} {in [format %s_ehy%s%s $cmdname $mid_str $extension] ehy 0 0 0 0 10 10 10 0 0 10 3 }
+  proc in_ell {cmdname {mid_str ""} {extension ".s"}} {in [format %s_ell%s%s $cmdname $mid_str $extension] ell 10 0 0 -12 0 0 0 -3 0 0 0 5 } 
+  proc in_ell1 {cmdname {mid_str ""} {extension ".s"}} {in [format %s_ell1%s%s $cmdname $mid_str $extension] ell1 3 2 8 3 -1 8 4 }
+  proc in_epa {cmdname {mid_str ""} {extension ".s"}} {in [format %s_epa%s%s $cmdname $mid_str $extension] epa 0 0 0 3 0 0 0 5 0 3 } 
+  proc in_eto {cmdname {mid_str ""} {extension ".s"}} {in [format %s_eto%s%s $cmdname $mid_str $extension] eto 0 0 0 1 1 1 10 0 2 2 1.5 }
+  proc in_grip {cmdname {mid_str ""} {extension ".s"}} {in [format %s_grip%s%s $cmdname $mid_str $extension] grip 0 0 0 3 0 0 6 }
+  proc in_half {cmdname {mid_str ""} {extension ".s"}} {in [format %s_half%s%s $cmdname $mid_str $extension] half 1 1 1 5 }
+  proc in_hyp {cmdname {mid_str ""} {extension ".s"}} {in [format %s_hyp%s%s $cmdname $mid_str $extension] hyp 0 0 0 0 0 10 3 0 0 4 .3 }
+  proc in_part {cmdname {mid_str ""} {extension ".s"}} {in [format %s_part%s%s $cmdname $mid_str $extension] part 0 0 0 0 0 16 4 2 }
+  proc in_pipe {cmdname {mid_str ""} {extension ".s"}} {in [format %s_pipe%s%s $cmdname $mid_str $extension] pipe 4 0 0 0 3 5 6 0 0 3 3 5 7 3 4 8 2 6 10 8 8 10 0 6 8 }
+  proc in_rcc {cmdname {mid_str ""} {extension ".s"}} {in [format %s_rcc%s%s $cmdname $mid_str $extension] rcc 0 0 0 3 3 30 7 }
+  proc in_rec {cmdname {mid_str ""} {extension ".s"}} {in [format %s_rec%s%s $cmdname $mid_str $extension] rec 0 0 0 3 3 10 10 0 0 0 3 0 }
+  proc in_rhc {cmdname {mid_str ""} {extension ".s"}} {in [format %s_rhc%s%s $cmdname $mid_str $extension] rhc 0 0 0 0 0 10 3 0 0 4 3 }
+  proc in_rpc {cmdname {mid_str ""} {extension ".s"}} {in [format %s_rpc%s%s $cmdname $mid_str $extension] rpc 0 0 0 0 0 4 0 1 0 3 }
+  proc in_rpp {cmdname {mid_str ""} {extension ".s"}} {in [format %s_rpp%s%s $cmdname $mid_str $extension] rpp 0 30 -3 12 -1 22 }
+  proc in_sph {cmdname {mid_str ""} {extension ".s"}} {in [format %s_sph%s%s $cmdname $mid_str $extension] sph 42 42 42 42 }
+  proc in_tec {cmdname {mid_str ""} {extension ".s"}} {in [format %s_tec%s%s $cmdname $mid_str $extension] tec 0 0 0 0 0 10 5 0 0 0 3 0 .6 }
+  proc in_tgc {cmdname {mid_str ""} {extension ".s"}} {in [format %s_tgc%s%s $cmdname $mid_str $extension] tgc 0 0 0 0 0 10 5 0 0 0 8 0 2 9 }
+  proc in_tor {cmdname {mid_str ""} {extension ".s"}} {in [format %s_tor%s%s $cmdname $mid_str $extension] tor 0 0 0 1 1 3 5 2 }
+  proc in_trc {cmdname {mid_str ""} {extension ".s"}} {in [format %s_trc%s%s $cmdname $mid_str $extension] trc 0 0 0 0 0 10 4 7 }
+
+  proc in_nmg {cmdname {mid_str ""} {extension ".s"}} {}
+
+  proc in_sketch {{cmdname "extrude"} {mid_str ""} {extension ""}} {put [format {%s_sketch%s%s} $cmdname $mid_str $extension] sketch V {10 20 30} A {1 0 0} B {0 1 0} VL { {250 0} {500 0} {500 500} {0 500} {0 250} {250 250} {125 125} {0 125} {125 0} {200 200} } SL { { bezier D 4 P { 4 7 9 8 0 } } { line S 0 E 1 } { line S 1 E 2 } { line S 2 E 3 } { line S 3 E 4 } { carc S 6 E 5 R -1 L 0 O 0 } }}
+
+  proc in_extrude {cmdname {mid_str ""} {extension ".s"} {sketch "extrude_sketch"}} { in [format %s_extrude%s%s $cmdname $mid_str $extension] extrude 0 0 0 0 0 1000 10 0 0 0 10 0 $sketch} 
+
+  # A convenience routine is defined for cases where one wants to
+  # use in to create an instance of each primitive.
+
+  proc in_all_prims { cmdname } {
+     global make_primitives_list
+     foreach x $make_primitives_list {
+	  if {![string match "extrude" $x] } {in_$x $cmdname "" .s}
+     }
+     
+     # Extrude's in command needs more args, handle it outside
+     # of the loop.
+     in_extrude $cmdname "" .s [format %s_sketch.s $cmdname]
+
+     # Remove this once nmg gets in support.  Don't do it if the
+     # cmdname is 'in' since that is supposed to be testing the
+     # in command, not the make command.  Otherwise, create it
+     # so there is some nmg to test.
+     if {![string match "in" $cmdname]} {
+       make [format %s_nmg.s $cmdname] nmg
+     }
+  }
+
+  proc edit_op_all_prims { cmdname args1 args2 } {
+     global make_primitives_list
+     foreach x $make_primitives_list {
+	  Z
+	  e [format %s_%s.s $cmdname $x]
+	  sed [format %s_%s.s $cmdname $x]
+          $cmdname $args1 [format %s_%s.s $cmdname $x] $args2
+	  accept
+	  Z
+     }
+  }
+
+
+
+  #  Often it is desirable to insert a large number of primitives with
+  #  sequential numbers - the batch_insert command is defined to handle
+  #  these situations.  In these cases the number is appended as the
+  #  last item in the name.
+
+  proc batch_insert {cmdname primname extension startnum endnum increment} {
+  	for {set i $startnum} {$i < [expr {$endnum + 1}]} {set i [expr {$i + $increment}]} {
+	   in_$primname $cmdname $extension $i
+	}
+  }
+
+  # TCL routines needed for specific commands, organized alphabetically
+  # according to command
+
+  # make_bb
+  proc make_bb_all {} {
+     global make_primitives_list
+     foreach x $make_primitives_list {
+	make_bb [format make_bb_box_%s.s $x] [format make_bb_%s.s $x]
+     }
+  }
+  
+
+  puts "Regression testing definitions loaded.\n"
+
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.