[Swift-commit] r5300 - trunk/tests/cdm

[wozniak at ci.uchicago.edu]

Author: wozniak
Date: 2011-11-14 18:14:56 -0600 (Mon, 14 Nov 2011)
New Revision: 5300

Added:
   trunk/tests/cdm/205-direct-output-abs.check.sh
   trunk/tests/cdm/205-direct-output-abs.clean.sh
   trunk/tests/cdm/205-direct-output-abs.setup.sh
   trunk/tests/cdm/205-direct-output-abs.swift
Removed:
   trunk/tests/cdm/211-direct-output-abs.check.sh
   trunk/tests/cdm/211-direct-output-abs.clean.sh
   trunk/tests/cdm/211-direct-output-abs.setup.sh
   trunk/tests/cdm/211-direct-output-abs.swift
Modified:
   trunk/tests/cdm/fs.template.data
Log:
Better numbering


Copied: trunk/tests/cdm/205-direct-output-abs.check.sh (from rev 5296, trunk/tests/cdm/211-direct-output-abs.check.sh)
===================================================================
--- trunk/tests/cdm/205-direct-output-abs.check.sh	                        (rev 0)
+++ trunk/tests/cdm/205-direct-output-abs.check.sh	2011-11-15 00:14:56 UTC (rev 5300)
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -x
+
+grep $( uname -m ) 211-input.txt  || exit 1
+grep $( uname -m ) /tmp/211-output.txt || exit 1
+
+exit 0

Copied: trunk/tests/cdm/205-direct-output-abs.clean.sh (from rev 5296, trunk/tests/cdm/211-direct-output-abs.clean.sh)
===================================================================
--- trunk/tests/cdm/205-direct-output-abs.clean.sh	                        (rev 0)
+++ trunk/tests/cdm/205-direct-output-abs.clean.sh	2011-11-15 00:14:56 UTC (rev 5300)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -x
+
+rm -v /tmp/211-output.txt || exit 1
+
+exit 0

Copied: trunk/tests/cdm/205-direct-output-abs.setup.sh (from rev 5296, trunk/tests/cdm/211-direct-output-abs.setup.sh)
===================================================================
--- trunk/tests/cdm/205-direct-output-abs.setup.sh	                        (rev 0)
+++ trunk/tests/cdm/205-direct-output-abs.setup.sh	2011-11-15 00:14:56 UTC (rev 5300)
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -x
+
+{
+  uname -a
+  date
+} > 211-input.txt
+
+exit 0

Copied: trunk/tests/cdm/205-direct-output-abs.swift (from rev 5298, trunk/tests/cdm/211-direct-output-abs.swift)
===================================================================
--- trunk/tests/cdm/205-direct-output-abs.swift	                        (rev 0)
+++ trunk/tests/cdm/205-direct-output-abs.swift	2011-11-15 00:14:56 UTC (rev 5300)
@@ -0,0 +1,14 @@
+
+type file;
+
+app (file o) copy (file i)
+{
+  cp @i @o;
+}
+
+file f1<"211-input.txt">;
+
+// Will be transformed by CDM to /tmp/211-output.txt:
+file f2<"/tmp/211-output.txt">;
+
+f2 = copy(f1);

Deleted: trunk/tests/cdm/211-direct-output-abs.check.sh
===================================================================
--- trunk/tests/cdm/211-direct-output-abs.check.sh	2011-11-15 00:11:46 UTC (rev 5299)
+++ trunk/tests/cdm/211-direct-output-abs.check.sh	2011-11-15 00:14:56 UTC (rev 5300)
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-set -x
-
-grep $( uname -m ) 211-input.txt  || exit 1
-grep $( uname -m ) /tmp/211-output.txt || exit 1
-
-exit 0

Deleted: trunk/tests/cdm/211-direct-output-abs.clean.sh
===================================================================
--- trunk/tests/cdm/211-direct-output-abs.clean.sh	2011-11-15 00:11:46 UTC (rev 5299)
+++ trunk/tests/cdm/211-direct-output-abs.clean.sh	2011-11-15 00:14:56 UTC (rev 5300)
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -x
-
-rm -v /tmp/211-output.txt || exit 1
-
-exit 0

Deleted: trunk/tests/cdm/211-direct-output-abs.setup.sh
===================================================================
--- trunk/tests/cdm/211-direct-output-abs.setup.sh	2011-11-15 00:11:46 UTC (rev 5299)
+++ trunk/tests/cdm/211-direct-output-abs.setup.sh	2011-11-15 00:14:56 UTC (rev 5300)
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -x
-
-{
-  uname -a
-  date
-} > 211-input.txt
-
-exit 0

Deleted: trunk/tests/cdm/211-direct-output-abs.swift
===================================================================
--- trunk/tests/cdm/211-direct-output-abs.swift	2011-11-15 00:11:46 UTC (rev 5299)
+++ trunk/tests/cdm/211-direct-output-abs.swift	2011-11-15 00:14:56 UTC (rev 5300)
@@ -1,14 +0,0 @@
-
-type file;
-
-app (file o) copy (file i)
-{
-  cp @i @o;
-}
-
-file f1<"211-input.txt">;
-
-// Will be transformed by CDM to /tmp/211-output.txt:
-file f2<"/tmp/211-output.txt">;
-
-f2 = copy(f1);

Modified: trunk/tests/cdm/fs.template.data
===================================================================
--- trunk/tests/cdm/fs.template.data	2011-11-15 00:11:46 UTC (rev 5299)
+++ trunk/tests/cdm/fs.template.data	2011-11-15 00:14:56 UTC (rev 5300)
@@ -4,8 +4,9 @@
 property GATHER_TARGET _PWD_/501-output
 
 rule .*201-output.txt DIRECT _PWD_/201
-rule .*210-input.txt EXTERNAL _PWD_/external.sh
-rule .*211-output.txt DIRECT /
+rule .*205-output.txt DIRECT /
+rule .*206-input.txt  DIRECT /
+rule .*210-input.txt EXTERNAL PWD_/external.sh
 rule .*301-input.txt BROADCAST _PWD_/301
 rule .*501-output.*.txt GATHER
 rule .*601-input.*.txt LOCAL cp _PWD_/601