[Swift-commit] r3588 - in trunk/tests: cdm cdm-ps

[noreply at svn.ci.uchicago.edu]

Author: wozniak
Date: 2010-08-30 14:16:01 -0500 (Mon, 30 Aug 2010)
New Revision: 3588

Added:
   trunk/tests/cdm-ps/202-direct-io.check.sh
   trunk/tests/cdm-ps/202-direct-io.clean.sh
   trunk/tests/cdm-ps/202-direct-io.setup.sh
   trunk/tests/cdm-ps/202-direct-io.swift
   trunk/tests/cdm-ps/merge.sh
Modified:
   trunk/tests/cdm-ps/201-direct-output.check.sh
   trunk/tests/cdm-ps/201-direct-output.clean.sh
   trunk/tests/cdm-ps/201-direct-output.swift
   trunk/tests/cdm-ps/fs.template.data
   trunk/tests/cdm-ps/tc.template.data
   trunk/tests/cdm/201-direct-output.check.sh
Log:
CDM-PS input/output test and related fixes


Modified: trunk/tests/cdm/201-direct-output.check.sh
===================================================================
--- trunk/tests/cdm/201-direct-output.check.sh	2010-08-30 18:27:24 UTC (rev 3587)
+++ trunk/tests/cdm/201-direct-output.check.sh	2010-08-30 19:16:01 UTC (rev 3588)
@@ -3,6 +3,6 @@
 set -x
 
 grep $( uname -m ) 201-input.txt  || exit 1
-grep $( uname -m ) 201/output.txt || exit 1
+grep $( uname -m ) 201/201-output.txt || exit 1
 
 exit 0

Modified: trunk/tests/cdm-ps/201-direct-output.check.sh
===================================================================
--- trunk/tests/cdm-ps/201-direct-output.check.sh	2010-08-30 18:27:24 UTC (rev 3587)
+++ trunk/tests/cdm-ps/201-direct-output.check.sh	2010-08-30 19:16:01 UTC (rev 3588)
@@ -3,6 +3,6 @@
 set -x
 
 grep $( uname -m ) 201-input.txt  || exit 1
-grep $( uname -m ) 201/output.txt || exit 1
+grep $( uname -m ) 201/201-output.txt || exit 1
 
 exit 0

Modified: trunk/tests/cdm-ps/201-direct-output.clean.sh
===================================================================
--- trunk/tests/cdm-ps/201-direct-output.clean.sh	2010-08-30 18:27:24 UTC (rev 3587)
+++ trunk/tests/cdm-ps/201-direct-output.clean.sh	2010-08-30 19:16:01 UTC (rev 3588)
@@ -2,6 +2,6 @@
 
 set -x
 
-rm -rv 201-input.txt 201
+rm -rv 201-input.txt 201 || exit 1
 
 exit 0

Modified: trunk/tests/cdm-ps/201-direct-output.swift
===================================================================
--- trunk/tests/cdm-ps/201-direct-output.swift	2010-08-30 18:27:24 UTC (rev 3587)
+++ trunk/tests/cdm-ps/201-direct-output.swift	2010-08-30 19:16:01 UTC (rev 3588)
@@ -9,6 +9,6 @@
 file f1<"201-input.txt">;
 
 // Will be transformed by CDM to 201/output.txt:
-file f2<"output.txt">;
+file f2<"201-output.txt">;
 
 f2 = copy(f1);

Added: trunk/tests/cdm-ps/202-direct-io.check.sh
===================================================================
--- trunk/tests/cdm-ps/202-direct-io.check.sh	                        (rev 0)
+++ trunk/tests/cdm-ps/202-direct-io.check.sh	2010-08-30 19:16:01 UTC (rev 3588)
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -x
+
+grep $( uname -m ) 202/202-input-1.txt || exit 1
+grep $( hostname ) 202/202-input-1.txt || exit 1
+
+grep $( uname -m ) 202/202-output.txt  || exit 1
+grep $( hostname ) 202/202-output.txt || exit 1
+
+exit 0


Property changes on: trunk/tests/cdm-ps/202-direct-io.check.sh
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/tests/cdm-ps/202-direct-io.clean.sh
===================================================================
--- trunk/tests/cdm-ps/202-direct-io.clean.sh	                        (rev 0)
+++ trunk/tests/cdm-ps/202-direct-io.clean.sh	2010-08-30 19:16:01 UTC (rev 3588)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -x
+
+rm -rv 202 || exit 1
+
+exit 0


Property changes on: trunk/tests/cdm-ps/202-direct-io.clean.sh
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/tests/cdm-ps/202-direct-io.setup.sh
===================================================================
--- trunk/tests/cdm-ps/202-direct-io.setup.sh	                        (rev 0)
+++ trunk/tests/cdm-ps/202-direct-io.setup.sh	2010-08-30 19:16:01 UTC (rev 3588)
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -x
+
+mkdir -v 202
+
+{
+  uname -a
+  date
+} > 202/202-input-1.txt
+
+{
+  hostname
+  pwd
+} > 202/202-input-2.txt
+
+exit 0


Property changes on: trunk/tests/cdm-ps/202-direct-io.setup.sh
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/tests/cdm-ps/202-direct-io.swift
===================================================================
--- trunk/tests/cdm-ps/202-direct-io.swift	                        (rev 0)
+++ trunk/tests/cdm-ps/202-direct-io.swift	2010-08-30 19:16:01 UTC (rev 3588)
@@ -0,0 +1,16 @@
+
+type file;
+
+app (file o) merge (file i, file j)
+{
+  merge @i @j @o;
+}
+
+// Will be transformed by CDM to 202/input-[12].txt
+file f1<"202-input-1.txt">;
+file f2<"202-input-2.txt">;
+
+// Will be transformed by CDM to 202/output.txt:
+file f3<"202-output.txt">;
+
+f3 = merge(f1, f2);

Modified: trunk/tests/cdm-ps/fs.template.data
===================================================================
--- trunk/tests/cdm-ps/fs.template.data	2010-08-30 18:27:24 UTC (rev 3587)
+++ trunk/tests/cdm-ps/fs.template.data	2010-08-30 19:16:01 UTC (rev 3588)
@@ -1 +1,4 @@
-rule .*output.txt DIRECT _PWD_/201
+rule .*201-output.txt  DIRECT _PWD_/201
+
+rule .*202-input.*.txt DIRECT _PWD_/202
+rule .*202-output.txt  DIRECT _PWD_/202

Added: trunk/tests/cdm-ps/merge.sh
===================================================================
--- trunk/tests/cdm-ps/merge.sh	                        (rev 0)
+++ trunk/tests/cdm-ps/merge.sh	2010-08-30 19:16:01 UTC (rev 3588)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+F1=$1
+F2=$2
+F3=$3
+
+cat $F1 $F2 > $F3


Property changes on: trunk/tests/cdm-ps/merge.sh
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/tests/cdm-ps/tc.template.data
===================================================================
--- trunk/tests/cdm-ps/tc.template.data	2010-08-30 18:27:24 UTC (rev 3587)
+++ trunk/tests/cdm-ps/tc.template.data	2010-08-30 19:16:01 UTC (rev 3588)
@@ -17,3 +17,4 @@
 localhost 	paste 		/bin/paste	INSTALLED	INTEL32::LINUX	null
 
 coasterslocal 	cp 		/bin/cp         INSTALLED	INTEL32::LINUX	null
+coasterslocal 	merge 		_DIR_/merge.sh      INSTALLED	INTEL32::LINUX	null