Changeset 4533

Timestamp:

Jul 17, 2014 11:48:21 AM (9 years ago)

Author:

gah

Message:

update regression tester

Location:

branches/1.3

Files:

• gui/scripts/vtkheightmapviewer.tcl (modified) (3 diffs)
• gui/scripts/vtkisosurfaceviewer.tcl (modified) (2 diffs)
• tester/scripts/Makefile.in (modified) (1 diff)
• tester/scripts/auto.tcl (added)
• tester/scripts/main.tcl (modified) (3 diffs)

branches/1.3/gui/scripts/vtkheightmapviewer.tcl

@@ -1421 +1421 @@
             set bool $_settings($what)
             set numColors [expr $_settings(-numisolines) + 1]
-            # FIXME: don't use StartBufferingCommands
             StartBufferingCommands
             if {$bool} {
@@ -1920 +1919 @@
         Rappture::Combobox $inner.colormap -width 10 -editable no
     }
-
     $inner.colormap choices insert end [GetColormapList -includeNone]
     $itk_component(colormap) value $_settings(-colormap)
@@ -2294 +2292 @@
         AdjustSetting -stretchtofit
     }
-
     if { $_currentNumIsolines != $style(-levels) } {
         set _currentNumIsolines $style(-levels)

branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl

@@ -1359 +1359 @@
             SendCmd "axis labels all $bool"
         }
-        "-xgrid" - "-ygrid" - "-zgrid" {
-            set axis [string tolower [string range $what 1 1]]
-            set bool $_settings($what)
-            SendCmd "axis grid $axis $bool"
-        }
         "-axismode" {
             set mode [$itk_component(axisMode) value]
@@ -1552 +1547 @@
             SendCmd "cutplane slice ${axis} ${pos}"
             set _cutplanePending 0
+        }
+        "-xgrid" - "-ygrid" - "-zgrid" {
+            set axis [string tolower [string range $what 1 1]]
+            set bool $_settings($what)
+            SendCmd "axis grid $axis $bool"
         }
         default {

branches/1.3/tester/scripts/Makefile.in

@@ -18 +18 @@
 
 FILES           = \
+                $(srcdir)/auto.tcl \
                 $(srcdir)/main.tcl \
                 $(srcdir)/legend.tcl \

branches/1.3/tester/scripts/main.tcl

@@ -17 +17 @@
 #  USAGE: tester.tcl ?-tool tool.xml? ?-testdir tests?
 # ======================================================================
-#  AUTHOR:  Ben Rafferty, Purdue University
+#  AUTHORS:  Michael McLennan, Ben Rafferty, Purdue University
 #  Copyright (c) 2004-2012  HUBzero Foundation, LLC
 #
@@ -136 +136 @@
 set installdir [file dirname [file normalize $params(-tool)]]
 set xmlobj [Rappture::library $params(-tool)]
-set ToolObj [Rappture::Tool ::#auto $xmlobj $installdir]
+set TaskObj [Rappture::Task ::#auto $xmlobj $installdir]
+
+# tasks in the tester run quietly and discard results
+$TaskObj configure -jobstats "" -resultdir ""
+
 set DiffShow ""  ;# used to track which diff objects are being displayed
 
@@ -296 +300 @@
 set testtree [.pw pane 0].tree
 foreach file [glob -nocomplain -directory $params(-testdir) *.xml] {
-    set testobj [Rappture::Tester::Test ::#auto $ToolObj $file]
+    set testobj [Rappture::Tester::Test ::#auto $TaskObj $file]
     if {[$testobj getTestInfo test.label] eq ""} {
         puts stderr "ERROR:  Missing test label in $file"