[Swift-commit] r5104 - in trunk: bin tests/groups tests/language-behaviour/datatypes

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2011-09-12 18:11:55 -0500 (Mon, 12 Sep 2011)
New Revision: 5104

Added:
   trunk/tests/language-behaviour/datatypes/056-struct-stage-out.b.expected
   trunk/tests/language-behaviour/datatypes/056-struct-stage-out.c.expected
   trunk/tests/language-behaviour/datatypes/056-struct-stage-out.mapper.sh
   trunk/tests/language-behaviour/datatypes/056-struct-stage-out.setup.sh
   trunk/tests/language-behaviour/datatypes/056-struct-stage-out.swift
Modified:
   trunk/bin/swift
   trunk/tests/groups/group-all-local.sh
Log:
Add test for staging out structs
Use language-behavior/datatypes tests
Fix syntax error in swift script


Modified: trunk/bin/swift
===================================================================
--- trunk/bin/swift	2011-09-12 22:24:01 UTC (rev 5103)
+++ trunk/bin/swift	2011-09-12 23:11:55 UTC (rev 5104)
@@ -64,7 +64,7 @@
 # make sure sites.xml file is well-formed
 
 $SWIFT_HOME/bin/chxml $CMDLINE
-if [[ ${?} != 0 ]]; then
+if [ "$?" != 0 ]; then
 	echo "Could not process input files!"
 	exit 1
 fi

Modified: trunk/tests/groups/group-all-local.sh
===================================================================
--- trunk/tests/groups/group-all-local.sh	2011-09-12 22:24:01 UTC (rev 5103)
+++ trunk/tests/groups/group-all-local.sh	2011-09-12 23:11:55 UTC (rev 5104)
@@ -11,6 +11,7 @@
             $TESTDIR/language-behaviour/broken \
 	    $TESTDIR/language-behaviour/compounds \
             $TESTDIR/language-behaviour/control_structures \
+            $TESTDIR/language-behaviour/datatypes \
 	    $TESTDIR/language-behaviour/IO \
 	    $TESTDIR/language-behaviour/iterators \
 	    $TESTDIR/language-behaviour/logic \

Added: trunk/tests/language-behaviour/datatypes/056-struct-stage-out.b.expected
===================================================================
--- trunk/tests/language-behaviour/datatypes/056-struct-stage-out.b.expected	                        (rev 0)
+++ trunk/tests/language-behaviour/datatypes/056-struct-stage-out.b.expected	2011-09-12 23:11:55 UTC (rev 5104)
@@ -0,0 +1 @@
+foo

Added: trunk/tests/language-behaviour/datatypes/056-struct-stage-out.c.expected
===================================================================
Added: trunk/tests/language-behaviour/datatypes/056-struct-stage-out.mapper.sh
===================================================================
--- trunk/tests/language-behaviour/datatypes/056-struct-stage-out.mapper.sh	                        (rev 0)
+++ trunk/tests/language-behaviour/datatypes/056-struct-stage-out.mapper.sh	2011-09-12 23:11:55 UTC (rev 5104)
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+echo "b 056-struct-stage-out.b"
+echo "c 056-struct-stage-out.c"


Property changes on: trunk/tests/language-behaviour/datatypes/056-struct-stage-out.mapper.sh
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/tests/language-behaviour/datatypes/056-struct-stage-out.setup.sh
===================================================================
--- trunk/tests/language-behaviour/datatypes/056-struct-stage-out.setup.sh	                        (rev 0)
+++ trunk/tests/language-behaviour/datatypes/056-struct-stage-out.setup.sh	2011-09-12 23:11:55 UTC (rev 5104)
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+cp -v $GROUP/056-struct-stage-out.mapper.sh . || exit 1


Property changes on: trunk/tests/language-behaviour/datatypes/056-struct-stage-out.setup.sh
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/tests/language-behaviour/datatypes/056-struct-stage-out.swift
===================================================================
--- trunk/tests/language-behaviour/datatypes/056-struct-stage-out.swift	                        (rev 0)
+++ trunk/tests/language-behaviour/datatypes/056-struct-stage-out.swift	2011-09-12 23:11:55 UTC (rev 5104)
@@ -0,0 +1,14 @@
+type file;
+
+type struct {
+        file b; 
+        file c; 
+}
+
+app (struct of) echo() {
+        echo "foo" stdout=@filename(of.b) stderr=@filename(of.c);
+}
+
+struct s <ext; exec="056-struct-stage-out.mapper.sh">;
+
+s = echo();