[Swift-commit] r7611 - SwiftApps/swift-galaxy/swift

[ketan at ci.uchicago.edu]

Author: ketan
Date: 2014-02-19 14:23:02 -0600 (Wed, 19 Feb 2014)
New Revision: 7611

Modified:
   SwiftApps/swift-galaxy/swift/swiftforeach.xml
   SwiftApps/swift-galaxy/swift/swiftforeachlist.sh
   SwiftApps/swift-galaxy/swift/swiftforeachrange.sh
Log:
commandline args and preselected site

Modified: SwiftApps/swift-galaxy/swift/swiftforeach.xml
===================================================================
--- SwiftApps/swift-galaxy/swift/swiftforeach.xml	2014-02-19 19:24:11 UTC (rev 7610)
+++ SwiftApps/swift-galaxy/swift/swiftforeach.xml	2014-02-19 20:23:02 UTC (rev 7611)
@@ -15,6 +15,7 @@
     #if $rangeorlist.rl == "rng" 
         swiftforeachrange.sh
         "${site}" 
+        "${swiftargs}"
         "${interpret}"
         "${exec}"
         "${rangeorlist.rngstart}"
@@ -30,6 +31,7 @@
     #elif $rangeorlist.rl == "lst"
         swiftforeachlist.sh
         "${site}"
+        "${swiftargs}"
         "${interpret}"
         "${exec}"
         "${rangeorlist.listfile}"
@@ -43,6 +45,7 @@
     #else
         swiftforeachtest.sh
         "${site}"
+        "${swiftargs}"
         "${interpret}"
         "${exec}"
         "${rangeorlist.rngstart}"
@@ -67,13 +70,15 @@
      -->
     <inputs>
         <param name="site" type="select" multiple="true" label="Execution Location" help="Multi-select list - hold the appropriate key while clicking to select multiple items">
-            <option value="localhost">Localhost</option>
+            <option value="localhost" selected="true">Localhost</option>
             <option value="midway">Midway</option>
             <option value="uc3">UC3</option>
             <option value="stampede">Stampede</option>
             <option value="tukey">Tukey</option>
         </param>
 
+        <param name="swiftargs" size="60" type="text" label="swiftargs" />
+
         <param name="interpret" type="select" label="Execution interpreter">
             <option value="sh">sh</option>
             <option value="python">python</option>
@@ -111,7 +116,7 @@
 
         </conditional>
         
-        <param name="stringargs" type="text" label="stringarg" />
+        <param name="stringargs" size="60" type="text" label="stringargs" />
 
         <repeat name="filearg" title="file arg">
             <param name="fileargname" type="data" label="filearg" />

Modified: SwiftApps/swift-galaxy/swift/swiftforeachlist.sh
===================================================================
--- SwiftApps/swift-galaxy/swift/swiftforeachlist.sh	2014-02-19 19:24:11 UTC (rev 7610)
+++ SwiftApps/swift-galaxy/swift/swiftforeachlist.sh	2014-02-19 20:23:02 UTC (rev 7611)
@@ -5,6 +5,8 @@
 # numeric range
 sites=$1 # comma separated list of sites
 shift
+swiftargs=$1 
+shift
 interpreter=$1
 shift
 executable=$1
@@ -84,7 +86,7 @@
 EOF
 done
 
-$swift -sites.file $wdir/sites.xml -tc.file $wdir/tc -config $wdir/cf $wdir/script.swift 2>$logfile
+$swift -sites.file $wdir/sites.xml -tc.file $wdir/tc -config $wdir/cf $wdir/script.swift "${swiftargs}" 2>$logfile
 EXITCODE=$?
 
 `for i in \`find $HOME/swift-sandbox -type f\`; do echo "\`basename $i\` $i"; done`

Modified: SwiftApps/swift-galaxy/swift/swiftforeachrange.sh
===================================================================
--- SwiftApps/swift-galaxy/swift/swiftforeachrange.sh	2014-02-19 19:24:11 UTC (rev 7610)
+++ SwiftApps/swift-galaxy/swift/swiftforeachrange.sh	2014-02-19 20:23:02 UTC (rev 7611)
@@ -6,6 +6,8 @@
 # numeric range
 sites=$1 # comma separated list of sites
 shift
+swiftargs=$1 
+shift
 interpreter=$1
 shift
 executable=$1
@@ -90,7 +92,7 @@
 EOF
 done
 
-$swift -sites.file $wdir/sites.xml -tc.file $wdir/tc -config $wdir/cf $wdir/script.swift 2>$logfile
+$swift -sites.file $wdir/sites.xml -tc.file $wdir/tc -config $wdir/cf $wdir/script.swift "${swiftargs}" 2>$logfile
 EXITCODE=$?
 
 #`for i in \`find $HOME/swift-sandbox -type f\`; do echo "\`basename $i\` $i"; done`