[Swift-commit] r5293 - branches/release-0.93/tests/cdm/absolute
ketan at ci.uchicago.edu
ketan at ci.uchicago.edu
Mon Nov 14 14:31:32 CST 2011
Author: ketan
Date: 2011-11-14 14:31:32 -0600 (Mon, 14 Nov 2011)
New Revision: 5293
Modified:
branches/release-0.93/tests/cdm/absolute/ff.kml
branches/release-0.93/tests/cdm/absolute/fr.kml
branches/release-0.93/tests/cdm/absolute/rf.kml
branches/release-0.93/tests/cdm/absolute/rr.kml
branches/release-0.93/tests/cdm/absolute/run.sh
Log:
added rule for out
Modified: branches/release-0.93/tests/cdm/absolute/ff.kml
===================================================================
--- branches/release-0.93/tests/cdm/absolute/ff.kml 2011-11-14 20:27:14 UTC (rev 5292)
+++ branches/release-0.93/tests/cdm/absolute/ff.kml 2011-11-14 20:31:32 UTC (rev 5293)
@@ -14,29 +14,29 @@
<vdl:new type="string" value="1" />
</global>
<global name="swift#string#17004">
- <vdl:new type="string" value="/home/ketan/cdm_tests/out2.data" />
+ <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out2.data" />
</global>
- <global name="swift#string#17008">
- <vdl:new type="string" value="/home/ketan/cdm_tests/data1.txt" />
- </global>
<global name="swift#string#17000">
<vdl:new type="string" value="s" />
</global>
- <global name="swift#string#17005">
- <vdl:new type="string" value="/home/ketan/cdm_tests/out3.data" />
+ <global name="swift#string#17010">
+ <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data4.txt" />
</global>
<global name="swift#string#17006">
- <vdl:new type="string" value="/home/ketan/cdm_tests/out4.data" />
+ <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out4.data" />
</global>
- <global name="swift#string#17003">
- <vdl:new type="string" value="/home/ketan/cdm_tests/out1.data" />
- </global>
<global name="swift#string#17009">
- <vdl:new type="string" value="/home/ketan/cdm_tests/data2.txt" />
+ <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data2.txt" />
</global>
- <global name="swift#string#17010">
- <vdl:new type="string" value="/home/ketan/cdm_tests/data4.txt" />
+ <global name="swift#string#17008">
+ <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data1.txt" />
</global>
+ <global name="swift#string#17005">
+ <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out3.data" />
+ </global>
+ <global name="swift#string#17003">
+ <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out1.data" />
+ </global>
<element name="catnap" arguments="o,_delay,i">
<parameterlog>
<string>input</string>
Modified: branches/release-0.93/tests/cdm/absolute/fr.kml
===================================================================
--- branches/release-0.93/tests/cdm/absolute/fr.kml 2011-11-14 20:27:14 UTC (rev 5292)
+++ branches/release-0.93/tests/cdm/absolute/fr.kml 2011-11-14 20:31:32 UTC (rev 5293)
@@ -13,35 +13,35 @@
<global name="swift#string#17001">
<vdl:new type="string" value="1" />
</global>
- <global name="swift#string#17008">
- <vdl:new type="string" value="/home/ketan/cdm_tests/data1.txt" />
- </global>
- <global name="swift#string#17003">
- <vdl:new type="string" value="out1.data" />
- </global>
<global name="swift#string#17000">
<vdl:new type="string" value="s" />
</global>
- <global name="swift#string#17004">
- <vdl:new type="string" value="out2.data" />
- </global>
- <global name="swift#string#17009">
- <vdl:new type="string" value="/home/ketan/cdm_tests/data2.txt" />
- </global>
<global name="swift#string#17010">
- <vdl:new type="string" value="/home/ketan/cdm_tests/data4.txt" />
+ <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data4.txt" />
</global>
<global name="swift#string#17006">
- <vdl:new type="string" value="out4.data" />
+ <vdl:new type="string" value="./outdir/out4.data" />
</global>
<global name="swift#string#17005">
- <vdl:new type="string" value="out3.data" />
+ <vdl:new type="string" value="./outdir/out3.data" />
</global>
- <element name="catnap" arguments="o,delay,i">
+ <global name="swift#string#17009">
+ <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data2.txt" />
+ </global>
+ <global name="swift#string#17008">
+ <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data1.txt" />
+ </global>
+ <global name="swift#string#17004">
+ <vdl:new type="string" value="./outdir/out2.data" />
+ </global>
+ <global name="swift#string#17003">
+ <vdl:new type="string" value="./outdir/out1.data" />
+ </global>
+ <element name="catnap" arguments="o,_delay,i">
<parameterlog>
<string>input</string>
- <string>delay</string>
- <vdl:getdatasetprovenanceid var="{delay}" />
+ <string>_delay</string>
+ <vdl:getdatasetprovenanceid var="{_delay}" />
<string>{#thread}</string>
</parameterlog>
<parameterlog>
@@ -59,11 +59,11 @@
<log level="debug" message="PROCEDURE line=4 thread={#thread} name=catnap"/>
<vdl:execute>
<vdl:tr>catnap</vdl:tr>
- <vdl:stagein var="{delay}"/>
+ <vdl:stagein var="{_delay}"/>
<vdl:stagein var="{i}"/>
<vdl:stageout var="{o}"/>
<vdl:arguments>
- <variable>delay</variable>
+ <variable>_delay</variable>
<swiftscript:filename>
<variable>i</variable>
</swiftscript:filename>
Modified: branches/release-0.93/tests/cdm/absolute/rf.kml
===================================================================
--- branches/release-0.93/tests/cdm/absolute/rf.kml 2011-11-14 20:27:14 UTC (rev 5292)
+++ branches/release-0.93/tests/cdm/absolute/rf.kml 2011-11-14 20:31:32 UTC (rev 5293)
@@ -11,37 +11,37 @@
</xs:schema>
</types>
<global name="swift#string#17008">
- <vdl:new type="string" value="data1.txt" />
+ <vdl:new type="string" value="./indir/data1.txt" />
</global>
<global name="swift#string#17001">
<vdl:new type="string" value="1" />
</global>
<global name="swift#string#17004">
- <vdl:new type="string" value="/home/ketan/cdm_tests/out2.data" />
+ <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out2.data" />
</global>
<global name="swift#string#17000">
<vdl:new type="string" value="s" />
</global>
- <global name="swift#string#17005">
- <vdl:new type="string" value="/home/ketan/cdm_tests/out3.data" />
+ <global name="swift#string#17010">
+ <vdl:new type="string" value="./indir/data4.txt" />
</global>
<global name="swift#string#17009">
- <vdl:new type="string" value="data2.txt" />
+ <vdl:new type="string" value="./indir/data2.txt" />
</global>
<global name="swift#string#17006">
- <vdl:new type="string" value="/home/ketan/cdm_tests/out4.data" />
+ <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out4.data" />
</global>
+ <global name="swift#string#17005">
+ <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out3.data" />
+ </global>
<global name="swift#string#17003">
- <vdl:new type="string" value="/home/ketan/cdm_tests/out1.data" />
+ <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out1.data" />
</global>
- <global name="swift#string#17010">
- <vdl:new type="string" value="data4.txt" />
- </global>
- <element name="catnap" arguments="o,delay,i">
+ <element name="catnap" arguments="o,_delay,i">
<parameterlog>
<string>input</string>
- <string>delay</string>
- <vdl:getdatasetprovenanceid var="{delay}" />
+ <string>_delay</string>
+ <vdl:getdatasetprovenanceid var="{_delay}" />
<string>{#thread}</string>
</parameterlog>
<parameterlog>
@@ -59,11 +59,11 @@
<log level="debug" message="PROCEDURE line=4 thread={#thread} name=catnap"/>
<vdl:execute>
<vdl:tr>catnap</vdl:tr>
- <vdl:stagein var="{delay}"/>
+ <vdl:stagein var="{_delay}"/>
<vdl:stagein var="{i}"/>
<vdl:stageout var="{o}"/>
<vdl:arguments>
- <variable>delay</variable>
+ <variable>_delay</variable>
<swiftscript:filename>
<variable>i</variable>
</swiftscript:filename>
Modified: branches/release-0.93/tests/cdm/absolute/rr.kml
===================================================================
--- branches/release-0.93/tests/cdm/absolute/rr.kml 2011-11-14 20:27:14 UTC (rev 5292)
+++ branches/release-0.93/tests/cdm/absolute/rr.kml 2011-11-14 20:31:32 UTC (rev 5293)
@@ -11,37 +11,37 @@
</xs:schema>
</types>
<global name="swift#string#17008">
- <vdl:new type="string" value="data1.txt" />
+ <vdl:new type="string" value="./indir/data1.txt" />
</global>
<global name="swift#string#17001">
<vdl:new type="string" value="1" />
</global>
- <global name="swift#string#17003">
- <vdl:new type="string" value="out1.data" />
- </global>
<global name="swift#string#17000">
<vdl:new type="string" value="s" />
</global>
- <global name="swift#string#17009">
- <vdl:new type="string" value="data2.txt" />
+ <global name="swift#string#17010">
+ <vdl:new type="string" value="./indir/data4.txt" />
</global>
- <global name="swift#string#17004">
- <vdl:new type="string" value="out2.data" />
- </global>
<global name="swift#string#17006">
- <vdl:new type="string" value="out4.data" />
+ <vdl:new type="string" value="./outdir/out4.data" />
</global>
- <global name="swift#string#17010">
- <vdl:new type="string" value="data4.txt" />
+ <global name="swift#string#17009">
+ <vdl:new type="string" value="./indir/data2.txt" />
</global>
<global name="swift#string#17005">
- <vdl:new type="string" value="out3.data" />
+ <vdl:new type="string" value="./outdir/out3.data" />
</global>
- <element name="catnap" arguments="o,delay,i">
+ <global name="swift#string#17004">
+ <vdl:new type="string" value="./outdir/out2.data" />
+ </global>
+ <global name="swift#string#17003">
+ <vdl:new type="string" value="./outdir/out1.data" />
+ </global>
+ <element name="catnap" arguments="o,_delay,i">
<parameterlog>
<string>input</string>
- <string>delay</string>
- <vdl:getdatasetprovenanceid var="{delay}" />
+ <string>_delay</string>
+ <vdl:getdatasetprovenanceid var="{_delay}" />
<string>{#thread}</string>
</parameterlog>
<parameterlog>
@@ -59,11 +59,11 @@
<log level="debug" message="PROCEDURE line=4 thread={#thread} name=catnap"/>
<vdl:execute>
<vdl:tr>catnap</vdl:tr>
- <vdl:stagein var="{delay}"/>
+ <vdl:stagein var="{_delay}"/>
<vdl:stagein var="{i}"/>
<vdl:stageout var="{o}"/>
<vdl:arguments>
- <variable>delay</variable>
+ <variable>_delay</variable>
<swiftscript:filename>
<variable>i</variable>
</swiftscript:filename>
Modified: branches/release-0.93/tests/cdm/absolute/run.sh
===================================================================
--- branches/release-0.93/tests/cdm/absolute/run.sh 2011-11-14 20:27:14 UTC (rev 5292)
+++ branches/release-0.93/tests/cdm/absolute/run.sh 2011-11-14 20:31:32 UTC (rev 5293)
@@ -1,16 +1,16 @@
-swift -config cf.absolute -sites.file sites.xml -tc.file tc -cdm.file fs.ff -runid ff_config_abs ff.swift
+swift -config cf.absolute -sites.file sites.xml -tc.file tc -cdm.file fs.data -runid ff_config_abs ff.swift
-swift -config cf.absolute -sites.file sites.xml -tc.file tc -cdm.file fs.ff -runid fr_config_abs fr.swift
+swift -config cf.absolute -sites.file sites.xml -tc.file tc -cdm.file fs.data -runid fr_config_abs fr.swift
-swift -config cf.absolute -sites.file sites.xml -tc.file tc -cdm.file fs.ff -runid rf_config_abs rf.swift
+swift -config cf.absolute -sites.file sites.xml -tc.file tc -cdm.file fs.data -runid rf_config_abs rf.swift
-swift -config cf.absolute -sites.file sites.xml -tc.file tc -cdm.file fs.ff -runid rr_config_abs rr.swift
+swift -config cf.absolute -sites.file sites.xml -tc.file tc -cdm.file fs.data -runid rr_config_abs rr.swift
-swift -config cf.relative -sites.file sites.xml -tc.file tc -cdm.file fs.ff -runid ff_config_rel ff.swift
+swift -config cf.relative -sites.file sites.xml -tc.file tc -cdm.file fs.data -runid ff_config_rel ff.swift
-swift -config cf.relative -sites.file sites.xml -tc.file tc -cdm.file fs.ff -runid fr_config_rel fr.swift
+swift -config cf.relative -sites.file sites.xml -tc.file tc -cdm.file fs.data -runid fr_config_rel fr.swift
-swift -config cf.relative -sites.file sites.xml -tc.file tc -cdm.file fs.ff -runid rf_config_rel rf.swift
+swift -config cf.relative -sites.file sites.xml -tc.file tc -cdm.file fs.data -runid rf_config_rel rf.swift
-swift -config cf.relative -sites.file sites.xml -tc.file tc -cdm.file fs.ff -runid rr_config_rel rr.swift
+swift -config cf.relative -sites.file sites.xml -tc.file tc -cdm.file fs.data -runid rr_config_rel rr.swift
More information about the Swift-commit
mailing list