Changeset 4127 for trunk/gui/apps

Timestamp:

Jan 16, 2014, 10:51:33 AM (11 years ago)

Author:

mmc

Message:

Added a "-auto" option to "rappture -tester" so you can run all tests
without the GUI in the background. This is needed as we try to run
regressions automatically during the contribtool process. In order to
do this, I had to split the Tool object into a "Task" that can run
without the GUI, and the "Tool" that acts as a ControlOwner?. I also
had to support for resource file processing into the generic Rappture
package. As a result, "rappture -tester -auto" can run without an
X window connection.

Added support for "job_protocol mx" in the resources file. If you
specify this, then Rappture will execute "mx cmd arg arg..." to run
each job.

Location:

trunk/gui/apps

Files:

• launcher.tcl (modified) (5 diffs)
• rappture.in (modified) (1 diff)

trunk/gui/apps/launcher.tcl

@@ -24 +24 @@
 #  redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # ======================================================================
-package require RapptureGUI
-set guidir $RapptureGUI::library
-
-package require RapptureBuilder
-set blddir $RapptureBuilder::library
-
-package require RapptureTester
-set testdir $RapptureTester::library
-
-set mainscript [file join $guidir scripts main.tcl]
+set mainscript ""
 set alist ""
 set toolxml ""
@@ -45 +36 @@
         switch -- $opt {
             -run {
+                package require RapptureGUI
+                set guidir $RapptureGUI::library
                 set mainscript [file join $guidir scripts main.tcl]
+                set reqpkgs Tk
             }
             -builder {
+                package require RapptureBuilder
+                set blddir $RapptureBuilder::library
                 set mainscript [file join $blddir scripts main.tcl]
+                set reqpkgs Tk
             }
             -tester {
+                package require RapptureTester
+                set testdir $RapptureTester::library
                 set mainscript [file join $testdir scripts main.tcl]
+                set reqpkgs Tk
             }
             -tool {
@@ -65 +65 @@
                 lappend alist $opt [lindex $argv 0]
                 set argv [lrange $argv 1 end]
+            }
+            -auto {
+                # for the tester in automatic mode -- don't load Tk
+                package require RapptureTester
+                set testdir $RapptureTester::library
+                set mainscript [file join $testdir scripts auto.tcl]
+                set reqpkgs ""
             }
             -load {
@@ -81 +88 @@
                 puts stderr "  rappture ?-run? ?-tool toolFile? ?-nosim 0/1? ?-load file file ...?"
                 puts stderr "  rappture -builder ?-tool toolFile?"
-                puts stderr "  rappture -tester ?-tool toolFile? ?-testdir directory?"
+                puts stderr "  rappture -tester ?-auto? ?-tool toolFile? ?-testdir directory?"
                 exit 1
             }
         }
     }
+}
+
+# If no arguments, assume that it's the -run option
+if {$mainscript eq ""} {
+    package require RapptureGUI
+    set guidir $RapptureGUI::library
+    set mainscript [file join $guidir scripts main.tcl]
+    set reqpkgs Tk
 }
 
@@ -97 +112 @@
 #       blt::bgexec.  It doesn't try to redirect stderr into a file.
 set argv $alist
-package require Tk
+foreach name $reqpkgs {
+    package require $name
+}
 source  $mainscript

trunk/gui/apps/rappture.in

@@ -16 +16 @@
 dir=`dirname $0`
 . $dir/rappture.env
-exec tclsh $dir/launcher.tcl -- "$@"
+exec tclsh $dir/launcher.tcl "$@"