[Swift-commit] r2150 - trunk/tests/misc

[noreply at svn.ci.uchicago.edu]

Author: benc
Date: 2008-07-27 13:39:44 -0500 (Sun, 27 Jul 2008)
New Revision: 2150

Added:
   trunk/tests/misc/external-mapper-args.args.expected
   trunk/tests/misc/external-mapper-args.mapper
   trunk/tests/misc/external-mapper-args.sh
   trunk/tests/misc/external-mapper-args.swift
Modified:
   trunk/tests/misc/run
Log:
external mapper was passing on a few parameters that it should not have been

Added: trunk/tests/misc/external-mapper-args.args.expected
===================================================================
--- trunk/tests/misc/external-mapper-args.args.expected	                        (rev 0)
+++ trunk/tests/misc/external-mapper-args.args.expected	2008-07-27 18:39:44 UTC (rev 2150)
@@ -0,0 +1 @@
+-foo bar

Added: trunk/tests/misc/external-mapper-args.mapper
===================================================================
--- trunk/tests/misc/external-mapper-args.mapper	                        (rev 0)
+++ trunk/tests/misc/external-mapper-args.mapper	2008-07-27 18:39:44 UTC (rev 2150)
@@ -0,0 +1,6 @@
+#!/bin/bash
+echo $@ > external-mapper-args.args
+echo "[0].l a.tmp"
+echo "[1].r b.tmp"
+echo "[2].l c.tmp"
+


Property changes on: trunk/tests/misc/external-mapper-args.mapper
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/tests/misc/external-mapper-args.sh
===================================================================
--- trunk/tests/misc/external-mapper-args.sh	                        (rev 0)
+++ trunk/tests/misc/external-mapper-args.sh	2008-07-27 18:39:44 UTC (rev 2150)
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+rm -f external-mapper-args.args
+swift external-mapper-args.swift
+if [ "$?" != "0" ] ; then
+  echo FAILED - SwiftScript did not complete successfully
+  exit 1
+fi
+
+diff external-mapper-args.args external-mapper-args.args.expected
+
+if [ "$?" != "0" ] ; then
+  echo FAILED - external mapper received wrong arguments
+  exit 2
+fi


Property changes on: trunk/tests/misc/external-mapper-args.sh
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/tests/misc/external-mapper-args.swift
===================================================================
--- trunk/tests/misc/external-mapper-args.swift	                        (rev 0)
+++ trunk/tests/misc/external-mapper-args.swift	2008-07-27 18:39:44 UTC (rev 2150)
@@ -0,0 +1,19 @@
+type messagefile;
+
+type cols {
+  messagefile l;
+  messagefile r;
+}
+
+(messagefile t) write(string s) { 
+    app {
+        echo s stdout=@filename(t);
+    }
+}
+
+cols outfile[] <ext; exec="./external-mapper-args.mapper", foo="bar">;
+
+outfile[0].l = write("slot 0");
+outfile[1].r = write("slot 1");
+outfile[2].l = write("slot 2");
+

Modified: trunk/tests/misc/run
===================================================================
--- trunk/tests/misc/run	2008-07-26 23:59:31 UTC (rev 2149)
+++ trunk/tests/misc/run	2008-07-27 18:39:44 UTC (rev 2150)
@@ -1,6 +1,7 @@
 #!/bin/sh
 for a in clusters no-retries dryrun typecheck path-prefix restart restart2 restart3 restart4 restart5 restart-iterate workernode-local \
 ordering-extern-notlazy restart-extern ordering-extern \
+external-mapper-args \
 ; do
  ./${a}.sh
  R=$?