[Swift-commit] r5291 - branches/release-0.93/tests/cdm/absolute

[ketan at ci.uchicago.edu]

Author: ketan
Date: 2011-11-14 14:25:58 -0600 (Mon, 14 Nov 2011)
New Revision: 5291

Modified:
   branches/release-0.93/tests/cdm/absolute/ff.swift
   branches/release-0.93/tests/cdm/absolute/fr.swift
   branches/release-0.93/tests/cdm/absolute/rf.swift
   branches/release-0.93/tests/cdm/absolute/rr.swift
Log:
improved tests

Modified: branches/release-0.93/tests/cdm/absolute/ff.swift
===================================================================
--- branches/release-0.93/tests/cdm/absolute/ff.swift	2011-11-14 20:18:29 UTC (rev 5290)
+++ branches/release-0.93/tests/cdm/absolute/ff.swift	2011-11-14 20:25:58 UTC (rev 5291)
@@ -8,9 +8,9 @@
 
 string delay=@arg("s","1");
 
-file out[]<array_mapper; files=["/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/out1.data","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/out2.data","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/out3.data","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/out4.data"]>;
+file out[]<array_mapper; files=["/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out1.data","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out2.data","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out3.data","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out4.data"]>;
 
-file data[]<array_mapper; files=["/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/data1.txt","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/data2.txt","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/data4.txt","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/data4.txt"]>;
+file data[]<array_mapper; files=["/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data1.txt","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data2.txt","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data4.txt","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data4.txt"]>;
 
 foreach o, j in out {
  out[j] = catnap(delay,data[j]);

Modified: branches/release-0.93/tests/cdm/absolute/fr.swift
===================================================================
--- branches/release-0.93/tests/cdm/absolute/fr.swift	2011-11-14 20:18:29 UTC (rev 5290)
+++ branches/release-0.93/tests/cdm/absolute/fr.swift	2011-11-14 20:25:58 UTC (rev 5291)
@@ -1,16 +1,16 @@
 
 type file;
 
-app (file o) catnap (string delay, file i)
+app (file o) catnap (string _delay, file i)
 {
- catnap delay @i stdout=@o;
+ catnap _delay @i stdout=@o;
 }
 
 string delay=@arg("s","1");
 
-file out[]<array_mapper; files=["out1.data","out2.data","out3.data","out4.data"]>;
+file out[]<array_mapper; files=["./outdir/out1.data","./outdir/out2.data","./outdir/out3.data","./outdir/out4.data"]>;
 
-file data[]<array_mapper; files=["/home/ketan/cdm_tests/data1.txt","/home/ketan/cdm_tests/data2.txt","/home/ketan/cdm_tests/data4.txt","/home/ketan/cdm_tests/data4.txt"]>;
+file data[]<array_mapper; files=["/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data1.txt","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data2.txt","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data4.txt","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data4.txt"]>;
 
 foreach o, j in out {
  out[j] = catnap(delay,data[j]);

Modified: branches/release-0.93/tests/cdm/absolute/rf.swift
===================================================================
--- branches/release-0.93/tests/cdm/absolute/rf.swift	2011-11-14 20:18:29 UTC (rev 5290)
+++ branches/release-0.93/tests/cdm/absolute/rf.swift	2011-11-14 20:25:58 UTC (rev 5291)
@@ -1,16 +1,16 @@
 
 type file;
 
-app (file o) catnap (string delay, file i)
+app (file o) catnap (string _delay, file i)
 {
- catnap delay @i stdout=@o;
+ catnap _delay @i stdout=@o;
 }
 
 string delay=@arg("s","1");
 
-file out[]<array_mapper; files=["/home/ketan/cdm_tests/out1.data","/home/ketan/cdm_tests/out2.data","/home/ketan/cdm_tests/out3.data","/home/ketan/cdm_tests/out4.data"]>;
+file out[]<array_mapper; files=["/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out1.data","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out2.data","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out3.data","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out4.data"]>;
 
-file data[]<array_mapper; files=["data1.txt","data2.txt","data4.txt","data4.txt"]>;
+file data[]<array_mapper; files=["./indir/data1.txt","./indir/data2.txt","./indir/data4.txt","./indir/data4.txt"]>;
 
 foreach o, j in out {
  out[j] = catnap(delay,data[j]);

Modified: branches/release-0.93/tests/cdm/absolute/rr.swift
===================================================================
--- branches/release-0.93/tests/cdm/absolute/rr.swift	2011-11-14 20:18:29 UTC (rev 5290)
+++ branches/release-0.93/tests/cdm/absolute/rr.swift	2011-11-14 20:25:58 UTC (rev 5291)
@@ -1,16 +1,16 @@
 
 type file;
 
-app (file o) catnap (string delay, file i)
+app (file o) catnap (string _delay, file i)
 {
- catnap delay @i stdout=@o;
+ catnap _delay @i stdout=@o;
 }
 
 string delay=@arg("s","1");
 
-file out[]<array_mapper; files=["out1.data","out2.data","out3.data","out4.data"]>;
+file out[]<array_mapper; files=["./outdir/out1.data","./outdir/out2.data","./outdir/out3.data","./outdir/out4.data"]>;
 
-file data[]<array_mapper; files=["data1.txt","data2.txt","data4.txt","data4.txt"]>;
+file data[]<array_mapper; files=["./indir/data1.txt","./indir/data2.txt","./indir/data4.txt","./indir/data4.txt"]>;
 
 foreach o, j in out {
  out[j] = catnap(delay,data[j]);