[Swift-commit] r4757 - trunk/tests/language-behaviour/mappers
hategan at ci.uchicago.edu
hategan at ci.uchicago.edu
Sun Jul 3 19:32:17 CDT 2011
Author: hategan
Date: 2011-07-03 19:32:17 -0500 (Sun, 03 Jul 2011)
New Revision: 4757
Added:
trunk/tests/language-behaviour/mappers/0752-csv-mapper.csv.in
trunk/tests/language-behaviour/mappers/0754-csv-mapper.csv.in
trunk/tests/language-behaviour/mappers/07551-ext-mapper-single.sh.in
trunk/tests/language-behaviour/mappers/07552-ext-mapper-numeric.sh.in
trunk/tests/language-behaviour/mappers/07554-ext-mapper-struct.sh.in
trunk/tests/language-behaviour/mappers/07555-ext-mapper-twostruct.sh.in
trunk/tests/language-behaviour/mappers/0756-ext-mapper-slow.sh.in
trunk/tests/language-behaviour/mappers/0757-ext-mapper-array.sh.in
trunk/tests/language-behaviour/mappers/0758-ext-mapper-array.sh.in
trunk/tests/language-behaviour/mappers/0759-ext-mapper-array.sh.in
trunk/tests/language-behaviour/mappers/07591-ext-mapper-multidimensional-array.sh.in
trunk/tests/language-behaviour/mappers/07592-ext-mapper-multidimensional-array-structs.sh.in
trunk/tests/language-behaviour/mappers/tc.template.mix.data
Removed:
trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.check.sh
trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.clean.sh
trunk/tests/language-behaviour/mappers/0752-csv-mapper.csv
trunk/tests/language-behaviour/mappers/0754-csv-mapper-input.swift
trunk/tests/language-behaviour/mappers/0754-csv-mapper.csv
trunk/tests/language-behaviour/mappers/07551-ext-mapper-single.sh
trunk/tests/language-behaviour/mappers/07552-ext-mapper-numeric.sh
trunk/tests/language-behaviour/mappers/07554-ext-mapper-struct.sh
trunk/tests/language-behaviour/mappers/07555-ext-mapper-twostruct.sh
trunk/tests/language-behaviour/mappers/0756-ext-mapper-slow.sh
trunk/tests/language-behaviour/mappers/0757-ext-mapper-array.sh
trunk/tests/language-behaviour/mappers/0758-ext-mapper-array.sh
trunk/tests/language-behaviour/mappers/0759-ext-mapper-array.sh
trunk/tests/language-behaviour/mappers/07591-ext-mapper-multidimensional-array.sh
trunk/tests/language-behaviour/mappers/07592-ext-mapper-multidimensional-array-structs.sh
Modified:
trunk/tests/language-behaviour/mappers/0032-strcat-mapper-param.1.out.expected
trunk/tests/language-behaviour/mappers/070-singlefilemapper.out.expected
trunk/tests/language-behaviour/mappers/07511-fixed-array-mapper-input.check.sh
trunk/tests/language-behaviour/mappers/0752-csv-mapper.swift
trunk/tests/language-behaviour/mappers/0755-ext-mapper.swift
trunk/tests/language-behaviour/mappers/07551-ext-mapper-single.swift
trunk/tests/language-behaviour/mappers/07552-ext-mapper-numeric.swift
trunk/tests/language-behaviour/mappers/07554-ext-mapper-struct.swift
trunk/tests/language-behaviour/mappers/07555-ext-mapper-twostruct.swift
trunk/tests/language-behaviour/mappers/075551-ext-mapper-twostruct-singleproducer.swift
trunk/tests/language-behaviour/mappers/0756-ext-mapper-slow.swift
trunk/tests/language-behaviour/mappers/0757-ext-mapper-array.swift
trunk/tests/language-behaviour/mappers/0758-ext-mapper-array.swift
trunk/tests/language-behaviour/mappers/0759-ext-mapper-array.swift
trunk/tests/language-behaviour/mappers/07591-ext-mapper-multidimensional-array.swift
trunk/tests/language-behaviour/mappers/07592-ext-mapper-multidimensional-array-structs.swift
trunk/tests/language-behaviour/mappers/T079-simplemapper-nosuffix_exception.swift
Log:
updated tests
Modified: trunk/tests/language-behaviour/mappers/0032-strcat-mapper-param.1.out.expected
===================================================================
--- trunk/tests/language-behaviour/mappers/0032-strcat-mapper-param.1.out.expected 2011-07-04 00:21:48 UTC (rev 4756)
+++ trunk/tests/language-behaviour/mappers/0032-strcat-mapper-param.1.out.expected 2011-07-04 00:32:17 UTC (rev 4757)
@@ -1,4 +1 @@
-#!/bin/bash
-set -x
-cat 0032-strcat-mapper-param.1.out | grep 0032-strcat-mapper-param.1 || exit 1
-exit 0
+0032-strcat-mapper-param.1
Modified: trunk/tests/language-behaviour/mappers/070-singlefilemapper.out.expected
===================================================================
--- trunk/tests/language-behaviour/mappers/070-singlefilemapper.out.expected 2011-07-04 00:21:48 UTC (rev 4756)
+++ trunk/tests/language-behaviour/mappers/070-singlefilemapper.out.expected 2011-07-04 00:32:17 UTC (rev 4757)
@@ -1,4 +1 @@
-#!/bin/bash
-set -x
-cat 070-singlefilemapper.out | grep 070-singlefilemapper.out || exit 1
-exit 0
+070-singlefilemapper.out
Deleted: trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.check.sh
===================================================================
--- trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.check.sh 2011-07-04 00:21:48 UTC (rev 4756)
+++ trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.check.sh 2011-07-04 00:32:17 UTC (rev 4757)
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -x
-cat 071-singlefilemapper-input.out | grep || exit 1
-exit 0
Deleted: trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.clean.sh
===================================================================
--- trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.clean.sh 2011-07-04 00:21:48 UTC (rev 4756)
+++ trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.clean.sh 2011-07-04 00:32:17 UTC (rev 4757)
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-set -x
-
-rm -v 071-singlefilemapper-input.in \
- 071-singlefilemapper-input.out || exit 1
-
-exit 0
-#!/bin/bash
-set -x
-rm -r 071-singlefilemapper-input-* 071-singlefilemapper-input.*ml 071-singlefilemapper-input.out || exit 1
-exit 0
Modified: trunk/tests/language-behaviour/mappers/07511-fixed-array-mapper-input.check.sh
===================================================================
--- trunk/tests/language-behaviour/mappers/07511-fixed-array-mapper-input.check.sh 2011-07-04 00:21:48 UTC (rev 4756)
+++ trunk/tests/language-behaviour/mappers/07511-fixed-array-mapper-input.check.sh 2011-07-04 00:32:17 UTC (rev 4757)
@@ -1,4 +1,6 @@
#!/bin/bash
set -x
-cat 07511-fixed-array-mapper-input.out | grep || exit 1
+cat $OUTPUT | grep "file: 07511-fixed-array-mapper-input.first.in" || exit 1
+cat $OUTPUT | grep "file: 07511-fixed-array-mapper-input.second.in" || exit 1
+cat $OUTPUT | grep "file: 07511-fixed-array-mapper-input.third.in" || exit 1
exit 0
Deleted: trunk/tests/language-behaviour/mappers/0752-csv-mapper.csv
===================================================================
--- trunk/tests/language-behaviour/mappers/0752-csv-mapper.csv 2011-07-04 00:21:48 UTC (rev 4756)
+++ trunk/tests/language-behaviour/mappers/0752-csv-mapper.csv 2011-07-04 00:32:17 UTC (rev 4757)
@@ -1,4 +0,0 @@
-l,r
-0752-csv-mapper.left-zero.out,0752-csv-mapper.right-zero.out
-0752-csv-mapper.left-one.out,0752-csv-mapper.right-one.out
-0752-csv-mapper.left-two.out,0752-csv-mapper.right-two.out
Copied: trunk/tests/language-behaviour/mappers/0752-csv-mapper.csv.in (from rev 4748, trunk/tests/language-behaviour/mappers/0752-csv-mapper.csv)
===================================================================
--- trunk/tests/language-behaviour/mappers/0752-csv-mapper.csv.in (rev 0)
+++ trunk/tests/language-behaviour/mappers/0752-csv-mapper.csv.in 2011-07-04 00:32:17 UTC (rev 4757)
@@ -0,0 +1,4 @@
+l,r
+0752-csv-mapper.left-zero.out,0752-csv-mapper.right-zero.out
+0752-csv-mapper.left-one.out,0752-csv-mapper.right-one.out
+0752-csv-mapper.left-two.out,0752-csv-mapper.right-two.out
Modified: trunk/tests/language-behaviour/mappers/0752-csv-mapper.swift
===================================================================
--- trunk/tests/language-behaviour/mappers/0752-csv-mapper.swift 2011-07-04 00:21:48 UTC (rev 4756)
+++ trunk/tests/language-behaviour/mappers/0752-csv-mapper.swift 2011-07-04 00:32:17 UTC (rev 4757)
@@ -11,7 +11,7 @@
}
}
-cols outfile[] <csv_mapper; file="0752-csv-mapper.csv">;
+cols outfile[] <csv_mapper; file="0752-csv-mapper.csv.in">;
outfile[0].l = write("slot 0");
outfile[1].r = write("slot 1");
Deleted: trunk/tests/language-behaviour/mappers/0754-csv-mapper-input.swift
===================================================================
--- trunk/tests/language-behaviour/mappers/0754-csv-mapper-input.swift 2011-07-04 00:21:48 UTC (rev 4756)
+++ trunk/tests/language-behaviour/mappers/0754-csv-mapper-input.swift 2011-07-04 00:32:17 UTC (rev 4757)
@@ -1,19 +0,0 @@
-type messagefile;
-
-type cols {
- messagefile l;
- messagefile r;
-}
-
-(messagefile t) write(messagefile s) {
- app {
- cat stdin=@filename(s) stdout=@filename(t);
- }
-}
-
-cols infiles[] <csv_mapper; file="0754-csv-mapper.csv">;
-
-messagefile outfile <"0754-csv-mapper-input.out">;
-
-outfile = write(infiles[1].r);
-
Deleted: trunk/tests/language-behaviour/mappers/0754-csv-mapper.csv
===================================================================
--- trunk/tests/language-behaviour/mappers/0754-csv-mapper.csv 2011-07-04 00:21:48 UTC (rev 4756)
+++ trunk/tests/language-behaviour/mappers/0754-csv-mapper.csv 2011-07-04 00:32:17 UTC (rev 4757)
@@ -1,4 +0,0 @@
-l,r
-0754-csv-mapper.left-zero.in,0754-csv-mapper.right-zero.in
-0754-csv-mapper.left-one.in,0754-csv-mapper.right-one.in
-0754-csv-mapper.left-two.in,0754-csv-mapper.right-two.in
Copied: trunk/tests/language-behaviour/mappers/0754-csv-mapper.csv.in (from rev 4748, trunk/tests/language-behaviour/mappers/0754-csv-mapper.csv)
===================================================================
--- trunk/tests/language-behaviour/mappers/0754-csv-mapper.csv.in (rev 0)
+++ trunk/tests/language-behaviour/mappers/0754-csv-mapper.csv.in 2011-07-04 00:32:17 UTC (rev 4757)
@@ -0,0 +1,4 @@
+l,r
+0754-csv-mapper.left-zero.in,0754-csv-mapper.right-zero.in
+0754-csv-mapper.left-one.in,0754-csv-mapper.right-one.in
+0754-csv-mapper.left-two.in,0754-csv-mapper.right-two.in
Modified: trunk/tests/language-behaviour/mappers/0755-ext-mapper.swift
===================================================================
--- trunk/tests/language-behaviour/mappers/0755-ext-mapper.swift 2011-07-04 00:21:48 UTC (rev 4756)
+++ trunk/tests/language-behaviour/mappers/0755-ext-mapper.swift 2011-07-04 00:32:17 UTC (rev 4757)
@@ -11,7 +11,7 @@
}
}
-cols outfile[] <ext; exec="./0755-ext-mapper.sh">;
+cols outfile[] <ext; exec="./0755-ext-mapper.sh.in">;
outfile[0].l = write("slot 0");
outfile[1].r = write("slot 1");
Deleted: trunk/tests/language-behaviour/mappers/07551-ext-mapper-single.sh
===================================================================
--- trunk/tests/language-behaviour/mappers/07551-ext-mapper-single.sh 2011-07-04 00:21:48 UTC (rev 4756)
+++ trunk/tests/language-behaviour/mappers/07551-ext-mapper-single.sh 2011-07-04 00:32:17 UTC (rev 4757)
@@ -1,2 +0,0 @@
-#!/bin/bash
-echo "$ 07551-ext-mapper-single.out"
Copied: trunk/tests/language-behaviour/mappers/07551-ext-mapper-single.sh.in (from rev 4748, trunk/tests/language-behaviour/mappers/07551-ext-mapper-single.sh)
===================================================================
--- trunk/tests/language-behaviour/mappers/07551-ext-mapper-single.sh.in (rev 0)
+++ trunk/tests/language-behaviour/mappers/07551-ext-mapper-single.sh.in 2011-07-04 00:32:17 UTC (rev 4757)
@@ -0,0 +1,2 @@
+#!/bin/bash
+echo "$ 07551-ext-mapper-single.out"
Modified: trunk/tests/language-behaviour/mappers/07551-ext-mapper-single.swift
===================================================================
--- trunk/tests/language-behaviour/mappers/07551-ext-mapper-single.swift 2011-07-04 00:21:48 UTC (rev 4756)
+++ trunk/tests/language-behaviour/mappers/07551-ext-mapper-single.swift 2011-07-04 00:32:17 UTC (rev 4757)
@@ -6,7 +6,7 @@
}
}
-messagefile outfile <ext; exec="./07551-ext-mapper-single.sh">;
+messagefile outfile <ext; exec="./07551-ext-mapper-single.sh.in">;
outfile = write("slot 0");
Deleted: trunk/tests/language-behaviour/mappers/07552-ext-mapper-numeric.sh
===================================================================
--- trunk/tests/language-behaviour/mappers/07552-ext-mapper-numeric.sh 2011-07-04 00:21:48 UTC (rev 4756)
+++ trunk/tests/language-behaviour/mappers/07552-ext-mapper-numeric.sh 2011-07-04 00:32:17 UTC (rev 4757)
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-echo $@ > 07552-ext-mapper-numeric.mapper.out
-
-echo "$ 07552-ext-mapper-numeric.inside.out"
-
Copied: trunk/tests/language-behaviour/mappers/07552-ext-mapper-numeric.sh.in (from rev 4748, trunk/tests/language-behaviour/mappers/07552-ext-mapper-numeric.sh)
===================================================================
--- trunk/tests/language-behaviour/mappers/07552-ext-mapper-numeric.sh.in (rev 0)
+++ trunk/tests/language-behaviour/mappers/07552-ext-mapper-numeric.sh.in 2011-07-04 00:32:17 UTC (rev 4757)
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+echo $@ > 07552-ext-mapper-numeric.mapper.out
+
+echo "$ 07552-ext-mapper-numeric.inside.out"
+
Modified: trunk/tests/language-behaviour/mappers/07552-ext-mapper-numeric.swift
===================================================================
--- trunk/tests/language-behaviour/mappers/07552-ext-mapper-numeric.swift 2011-07-04 00:21:48 UTC (rev 4756)
+++ trunk/tests/language-behaviour/mappers/07552-ext-mapper-numeric.swift 2011-07-04 00:32:17 UTC (rev 4757)
@@ -7,7 +7,7 @@
}
int n = 5000;
-messagefile outfile <ext; exec="07552-ext-mapper-numeric.sh", ssss=n>;
+messagefile outfile <ext; exec="07552-ext-mapper-numeric.sh.in", ssss=n>;
outfile = greeting(n);
Deleted: trunk/tests/language-behaviour/mappers/07554-ext-mapper-struct.sh
===================================================================
--- trunk/tests/language-behaviour/mappers/07554-ext-mapper-struct.sh 2011-07-04 00:21:48 UTC (rev 4756)
+++ trunk/tests/language-behaviour/mappers/07554-ext-mapper-struct.sh 2011-07-04 00:32:17 UTC (rev 4757)
@@ -1,3 +0,0 @@
-#!/bin/bash
-echo "eerste 07554-ext-mapper-struct.a.out"
-echo "twede 07554-ext-mapper-struct.b.out"
Copied: trunk/tests/language-behaviour/mappers/07554-ext-mapper-struct.sh.in (from rev 4748, trunk/tests/language-behaviour/mappers/07554-ext-mapper-struct.sh)
===================================================================
--- trunk/tests/language-behaviour/mappers/07554-ext-mapper-struct.sh.in (rev 0)
+++ trunk/tests/language-behaviour/mappers/07554-ext-mapper-struct.sh.in 2011-07-04 00:32:17 UTC (rev 4757)
@@ -0,0 +1,3 @@
+#!/bin/bash
+echo "eerste 07554-ext-mapper-struct.a.out"
+echo "twede 07554-ext-mapper-struct.b.out"
Modified: trunk/tests/language-behaviour/mappers/07554-ext-mapper-struct.swift
===================================================================
--- trunk/tests/language-behaviour/mappers/07554-ext-mapper-struct.swift 2011-07-04 00:21:48 UTC (rev 4756)
+++ trunk/tests/language-behaviour/mappers/07554-ext-mapper-struct.swift 2011-07-04 00:32:17 UTC (rev 4757)
@@ -11,7 +11,7 @@
}
}
-struct outfiles <ext; exec="./07554-ext-mapper-struct.sh">;
+struct outfiles <ext; exec="./07554-ext-mapper-struct.sh.in">;
outfiles.eerste = write("1st");
outfiles.twede = write("2nd");
Deleted: trunk/tests/language-behaviour/mappers/07555-ext-mapper-twostruct.sh
===================================================================
--- trunk/tests/language-behaviour/mappers/07555-ext-mapper-twostruct.sh 2011-07-04 00:21:48 UTC (rev 4756)
+++ trunk/tests/language-behaviour/mappers/07555-ext-mapper-twostruct.sh 2011-07-04 00:32:17 UTC (rev 4757)
@@ -1,5 +0,0 @@
-#!/bin/bash
-echo "eerste 07555-ext-mapper-twostruct.a.out"
-echo "twede 07555-ext-mapper-twostruct.b.out"
-echo "derde.links 07555-ext-mapper-twostruct.cl.out"
-echo "derde.rechts 07555-ext-mapper-twostruct.cr.out"
Copied: trunk/tests/language-behaviour/mappers/07555-ext-mapper-twostruct.sh.in (from rev 4748, trunk/tests/language-behaviour/mappers/07555-ext-mapper-twostruct.sh)
===================================================================
--- trunk/tests/language-behaviour/mappers/07555-ext-mapper-twostruct.sh.in (rev 0)
+++ trunk/tests/language-behaviour/mappers/07555-ext-mapper-twostruct.sh.in 2011-07-04 00:32:17 UTC (rev 4757)
@@ -0,0 +1,5 @@
+#!/bin/bash
+echo "eerste 07555-ext-mapper-twostruct.a.out"
+echo "twede 07555-ext-mapper-twostruct.b.out"
+echo "derde.links 07555-ext-mapper-twostruct.cl.out"
+echo "derde.rechts 07555-ext-mapper-twostruct.cr.out"
Modified: trunk/tests/language-behaviour/mappers/07555-ext-mapper-twostruct.swift
===================================================================
--- trunk/tests/language-behaviour/mappers/07555-ext-mapper-twostruct.swift 2011-07-04 00:21:48 UTC (rev 4756)
+++ trunk/tests/language-behaviour/mappers/07555-ext-mapper-twostruct.swift 2011-07-04 00:32:17 UTC (rev 4757)
@@ -17,7 +17,7 @@
}
}
-struct outfiles <ext; exec="./07555-ext-mapper-twostruct.sh">;
+struct outfiles <ext; exec="./07555-ext-mapper-twostruct.sh.in">;
outfiles.eerste = write("1st");
outfiles.twede = write("2nd");
Modified: trunk/tests/language-behaviour/mappers/075551-ext-mapper-twostruct-singleproducer.swift
===================================================================
--- trunk/tests/language-behaviour/mappers/075551-ext-mapper-twostruct-singleproducer.swift 2011-07-04 00:21:48 UTC (rev 4756)
+++ trunk/tests/language-behaviour/mappers/075551-ext-mapper-twostruct-singleproducer.swift 2011-07-04 00:32:17 UTC (rev 4757)
@@ -17,7 +17,7 @@
}
}
-struct outfiles <ext; exec="./07555-ext-mapper-twostruct.sh">;
+struct outfiles <ext; exec="./07555-ext-mapper-twostruct.sh.in">;
outfiles = singlewrite();
Deleted: trunk/tests/language-behaviour/mappers/0756-ext-mapper-slow.sh
===================================================================
--- trunk/tests/language-behaviour/mappers/0756-ext-mapper-slow.sh 2011-07-04 00:21:48 UTC (rev 4756)
+++ trunk/tests/language-behaviour/mappers/0756-ext-mapper-slow.sh 2011-07-04 00:32:17 UTC (rev 4757)
@@ -1,8 +0,0 @@
-#!/bin/bash
-sleep 10s
-echo "[0].l 0756-ext-mapper.AAA.out"
-sleep 10s
-echo "[1].r 0756-ext-mapper.0.3.2.1.out"
-sleep 10s
-echo "[2].l 0756-ext-mapper.____.out"
-sleep 10s
Copied: trunk/tests/language-behaviour/mappers/0756-ext-mapper-slow.sh.in (from rev 4748, trunk/tests/language-behaviour/mappers/0756-ext-mapper-slow.sh)
===================================================================
--- trunk/tests/language-behaviour/mappers/0756-ext-mapper-slow.sh.in (rev 0)
+++ trunk/tests/language-behaviour/mappers/0756-ext-mapper-slow.sh.in 2011-07-04 00:32:17 UTC (rev 4757)
@@ -0,0 +1,8 @@
+#!/bin/bash
+sleep 10s
+echo "[0].l 0756-ext-mapper.AAA.out"
+sleep 10s
+echo "[1].r 0756-ext-mapper.0.3.2.1.out"
+sleep 10s
+echo "[2].l 0756-ext-mapper.____.out"
+sleep 10s
Modified: trunk/tests/language-behaviour/mappers/0756-ext-mapper-slow.swift
===================================================================
--- trunk/tests/language-behaviour/mappers/0756-ext-mapper-slow.swift 2011-07-04 00:21:48 UTC (rev 4756)
+++ trunk/tests/language-behaviour/mappers/0756-ext-mapper-slow.swift 2011-07-04 00:32:17 UTC (rev 4757)
@@ -11,7 +11,7 @@
}
}
-cols outfile[] <ext; exec="./0756-ext-mapper-slow.sh">;
+cols outfile[] <ext; exec="./0756-ext-mapper-slow.sh.in">;
outfile[0].l = write("slot 0");
outfile[1].r = write("slot 1");
Deleted: trunk/tests/language-behaviour/mappers/0757-ext-mapper-array.sh
===================================================================
--- trunk/tests/language-behaviour/mappers/0757-ext-mapper-array.sh 2011-07-04 00:21:48 UTC (rev 4756)
+++ trunk/tests/language-behaviour/mappers/0757-ext-mapper-array.sh 2011-07-04 00:32:17 UTC (rev 4757)
@@ -1,4 +0,0 @@
-echo "[0] 0757-ext-mapper-array.AAA.out"
-echo "[1] 0757-ext-mapper-array.0.3.2.1.out"
-echo "[2] 0757-ext-mapper-array.____.out"
-
Copied: trunk/tests/language-behaviour/mappers/0757-ext-mapper-array.sh.in (from rev 4748, trunk/tests/language-behaviour/mappers/0757-ext-mapper-array.sh)
===================================================================
--- trunk/tests/language-behaviour/mappers/0757-ext-mapper-array.sh.in (rev 0)
+++ trunk/tests/language-behaviour/mappers/0757-ext-mapper-array.sh.in 2011-07-04 00:32:17 UTC (rev 4757)
@@ -0,0 +1,4 @@
+echo "[0] 0757-ext-mapper-array.AAA.out"
+echo "[1] 0757-ext-mapper-array.0.3.2.1.out"
+echo "[2] 0757-ext-mapper-array.____.out"
+
Modified: trunk/tests/language-behaviour/mappers/0757-ext-mapper-array.swift
===================================================================
--- trunk/tests/language-behaviour/mappers/0757-ext-mapper-array.swift 2011-07-04 00:21:48 UTC (rev 4756)
+++ trunk/tests/language-behaviour/mappers/0757-ext-mapper-array.swift 2011-07-04 00:32:17 UTC (rev 4757)
@@ -6,7 +6,7 @@
}
}
-messagefile outfile[] <ext; exec="./0757-ext-mapper-array.sh">;
+messagefile outfile[] <ext; exec="./0757-ext-mapper-array.sh.in">;
outfile[0] = write("slot 0");
outfile[1] = write("slot 1");
Deleted: trunk/tests/language-behaviour/mappers/0758-ext-mapper-array.sh
===================================================================
--- trunk/tests/language-behaviour/mappers/0758-ext-mapper-array.sh 2011-07-04 00:21:48 UTC (rev 4756)
+++ trunk/tests/language-behaviour/mappers/0758-ext-mapper-array.sh 2011-07-04 00:32:17 UTC (rev 4757)
@@ -1,4 +0,0 @@
-echo "[0] 0757-ext-mapper-array.AAA.out"
-echo "[1] 0757-ext-mapper-array.0.3.2.1.out"
-echo "[2] 0757-ext-mapper-array.____.out"
-
Copied: trunk/tests/language-behaviour/mappers/0758-ext-mapper-array.sh.in (from rev 4748, trunk/tests/language-behaviour/mappers/0758-ext-mapper-array.sh)
===================================================================
--- trunk/tests/language-behaviour/mappers/0758-ext-mapper-array.sh.in (rev 0)
+++ trunk/tests/language-behaviour/mappers/0758-ext-mapper-array.sh.in 2011-07-04 00:32:17 UTC (rev 4757)
@@ -0,0 +1,4 @@
+echo "[0] 0757-ext-mapper-array.AAA.out"
+echo "[1] 0757-ext-mapper-array.0.3.2.1.out"
+echo "[2] 0757-ext-mapper-array.____.out"
+
Modified: trunk/tests/language-behaviour/mappers/0758-ext-mapper-array.swift
===================================================================
--- trunk/tests/language-behaviour/mappers/0758-ext-mapper-array.swift 2011-07-04 00:21:48 UTC (rev 4756)
+++ trunk/tests/language-behaviour/mappers/0758-ext-mapper-array.swift 2011-07-04 00:32:17 UTC (rev 4757)
@@ -6,7 +6,7 @@
}
}
-messagefile outfile[] <ext; exec="./0758-ext-mapper-array.sh">;
+messagefile outfile[] <ext; exec="./0758-ext-mapper-array.sh.in">;
foreach f,i in [0:2] {
outfile[i] = write("slot X");
Deleted: trunk/tests/language-behaviour/mappers/0759-ext-mapper-array.sh
===================================================================
--- trunk/tests/language-behaviour/mappers/0759-ext-mapper-array.sh 2011-07-04 00:21:48 UTC (rev 4756)
+++ trunk/tests/language-behaviour/mappers/0759-ext-mapper-array.sh 2011-07-04 00:32:17 UTC (rev 4757)
@@ -1,3 +0,0 @@
-#!/bin/bash
-echo [0] 0759-ext-mapper-array.a.out
-echo [1] 0759-ext-mapper-array.q.out
Copied: trunk/tests/language-behaviour/mappers/0759-ext-mapper-array.sh.in (from rev 4748, trunk/tests/language-behaviour/mappers/0759-ext-mapper-array.sh)
===================================================================
--- trunk/tests/language-behaviour/mappers/0759-ext-mapper-array.sh.in (rev 0)
+++ trunk/tests/language-behaviour/mappers/0759-ext-mapper-array.sh.in 2011-07-04 00:32:17 UTC (rev 4757)
@@ -0,0 +1,3 @@
+#!/bin/bash
+echo [0] 0759-ext-mapper-array.a.out
+echo [1] 0759-ext-mapper-array.q.out
Modified: trunk/tests/language-behaviour/mappers/0759-ext-mapper-array.swift
===================================================================
--- trunk/tests/language-behaviour/mappers/0759-ext-mapper-array.swift 2011-07-04 00:21:48 UTC (rev 4756)
+++ trunk/tests/language-behaviour/mappers/0759-ext-mapper-array.swift 2011-07-04 00:32:17 UTC (rev 4757)
@@ -6,7 +6,7 @@
}
}
-file outfile[] <ext; exec="./0759-ext-mapper-array.sh">;
+file outfile[] <ext; exec="./0759-ext-mapper-array.sh.in">;
outfile = write();
Deleted: trunk/tests/language-behaviour/mappers/07591-ext-mapper-multidimensional-array.sh
===================================================================
--- trunk/tests/language-behaviour/mappers/07591-ext-mapper-multidimensional-array.sh 2011-07-04 00:21:48 UTC (rev 4756)
+++ trunk/tests/language-behaviour/mappers/07591-ext-mapper-multidimensional-array.sh 2011-07-04 00:32:17 UTC (rev 4757)
@@ -1,5 +0,0 @@
-#!/bin/bash
-echo [0][0].a out.n/1foo/0/00/00/ST.TU.pdt
-echo [0][0].b out.n/1foo/0/00/00/ST.TU.rmsd
-
-
Copied: trunk/tests/language-behaviour/mappers/07591-ext-mapper-multidimensional-array.sh.in (from rev 4748, trunk/tests/language-behaviour/mappers/07591-ext-mapper-multidimensional-array.sh)
===================================================================
--- trunk/tests/language-behaviour/mappers/07591-ext-mapper-multidimensional-array.sh.in (rev 0)
+++ trunk/tests/language-behaviour/mappers/07591-ext-mapper-multidimensional-array.sh.in 2011-07-04 00:32:17 UTC (rev 4757)
@@ -0,0 +1,5 @@
+#!/bin/bash
+echo [0][0].a out.n/1foo/0/00/00/ST.TU.pdt
+echo [0][0].b out.n/1foo/0/00/00/ST.TU.rmsd
+
+
Modified: trunk/tests/language-behaviour/mappers/07591-ext-mapper-multidimensional-array.swift
===================================================================
--- trunk/tests/language-behaviour/mappers/07591-ext-mapper-multidimensional-array.swift 2011-07-04 00:21:48 UTC (rev 4756)
+++ trunk/tests/language-behaviour/mappers/07591-ext-mapper-multidimensional-array.swift 2011-07-04 00:32:17 UTC (rev 4757)
@@ -10,7 +10,7 @@
touch @filenames(output);
}
-S o[][] <ext; exec="07591-ext-mapper-multidimensional-array.sh">;
+S o[][] <ext; exec="07591-ext-mapper-multidimensional-array.sh.in">;
o = touch();
Deleted: trunk/tests/language-behaviour/mappers/07592-ext-mapper-multidimensional-array-structs.sh
===================================================================
--- trunk/tests/language-behaviour/mappers/07592-ext-mapper-multidimensional-array-structs.sh 2011-07-04 00:21:48 UTC (rev 4756)
+++ trunk/tests/language-behaviour/mappers/07592-ext-mapper-multidimensional-array-structs.sh 2011-07-04 00:32:17 UTC (rev 4757)
@@ -1,6 +0,0 @@
-#!/bin/bash
-echo [0][0].a out.n/1foo/0/00/00/ST.TU.pdt
-echo [0][0].b out.n/1foo/0/00/00/ST.TU.rmsd
-echo [0][0].c[0] out.n/1foo/0/00/00/ST.TU.rmsd2
-
-
Copied: trunk/tests/language-behaviour/mappers/07592-ext-mapper-multidimensional-array-structs.sh.in (from rev 4748, trunk/tests/language-behaviour/mappers/07592-ext-mapper-multidimensional-array-structs.sh)
===================================================================
--- trunk/tests/language-behaviour/mappers/07592-ext-mapper-multidimensional-array-structs.sh.in (rev 0)
+++ trunk/tests/language-behaviour/mappers/07592-ext-mapper-multidimensional-array-structs.sh.in 2011-07-04 00:32:17 UTC (rev 4757)
@@ -0,0 +1,6 @@
+#!/bin/bash
+echo [0][0].a out.n/1foo/0/00/00/ST.TU.pdt
+echo [0][0].b out.n/1foo/0/00/00/ST.TU.rmsd
+echo [0][0].c[0] out.n/1foo/0/00/00/ST.TU.rmsd2
+
+
Modified: trunk/tests/language-behaviour/mappers/07592-ext-mapper-multidimensional-array-structs.swift
===================================================================
--- trunk/tests/language-behaviour/mappers/07592-ext-mapper-multidimensional-array-structs.swift 2011-07-04 00:21:48 UTC (rev 4756)
+++ trunk/tests/language-behaviour/mappers/07592-ext-mapper-multidimensional-array-structs.swift 2011-07-04 00:32:17 UTC (rev 4757)
@@ -11,7 +11,7 @@
touch @filenames(output);
}
-S o[][] <ext; exec="07592-ext-mapper-multidimensional-array-structs.sh">;
+S o[][] <ext; exec="07592-ext-mapper-multidimensional-array-structs.sh.in">;
o = touch();
Modified: trunk/tests/language-behaviour/mappers/T079-simplemapper-nosuffix_exception.swift
===================================================================
--- trunk/tests/language-behaviour/mappers/T079-simplemapper-nosuffix_exception.swift 2011-07-04 00:21:48 UTC (rev 4756)
+++ trunk/tests/language-behaviour/mappers/T079-simplemapper-nosuffix_exception.swift 2011-07-04 00:32:17 UTC (rev 4757)
@@ -1,3 +1,5 @@
+// THIS-SCRIPT-SHOULD-FAIL
+
// this one is like test T078-simplemapper-nosuffix, but demonstrates the
// mapping exception on invalid values
type messagefile;
Added: trunk/tests/language-behaviour/mappers/tc.template.mix.data
===================================================================
--- trunk/tests/language-behaviour/mappers/tc.template.mix.data (rev 0)
+++ trunk/tests/language-behaviour/mappers/tc.template.mix.data 2011-07-04 00:32:17 UTC (rev 4757)
@@ -0,0 +1,2 @@
+
+localhost echo_sh _DIR_/760-csv-mapper.sh INSTALLED INTEL32::LINUX null
More information about the Swift-commit
mailing list