[Swift-commit] r5992 - in branches/release-0.94/tests/language-behaviour: arrays cleanup
davidk at ci.uchicago.edu
davidk at ci.uchicago.edu
Thu Oct 25 16:18:39 CDT 2012
Author: davidk
Date: 2012-10-25 16:18:39 -0500 (Thu, 25 Oct 2012)
New Revision: 5992
Modified:
branches/release-0.94/tests/language-behaviour/arrays/020-array.clean.sh
branches/release-0.94/tests/language-behaviour/arrays/021-array-in-proc-param.clean.sh
branches/release-0.94/tests/language-behaviour/arrays/022-array-with-exprs.clean.sh
branches/release-0.94/tests/language-behaviour/arrays/025-array-passing.clean.sh
branches/release-0.94/tests/language-behaviour/arrays/027-array-assignment.clean.sh
branches/release-0.94/tests/language-behaviour/cleanup/001-proc-scope-cleanup.check.sh
branches/release-0.94/tests/language-behaviour/cleanup/011-proc-scope-alias-cleanup.check.sh
branches/release-0.94/tests/language-behaviour/cleanup/021-iter-scope-cleanup.check.sh
branches/release-0.94/tests/language-behaviour/cleanup/031-foreach-scope-cleanup.check.sh
branches/release-0.94/tests/language-behaviour/cleanup/041-if-scope-cleanup.check.sh
Log:
Fixes various tests that were failing
Modified: branches/release-0.94/tests/language-behaviour/arrays/020-array.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/arrays/020-array.clean.sh 2012-10-25 20:04:32 UTC (rev 5991)
+++ branches/release-0.94/tests/language-behaviour/arrays/020-array.clean.sh 2012-10-25 21:18:39 UTC (rev 5992)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 020-array-* 020-array.xml 020-array.kml 020-array.out || exit 1
+rm -r 020-array-* 020-array.swiftx 020-array.kml 020-array.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/arrays/021-array-in-proc-param.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/arrays/021-array-in-proc-param.clean.sh 2012-10-25 20:04:32 UTC (rev 5991)
+++ branches/release-0.94/tests/language-behaviour/arrays/021-array-in-proc-param.clean.sh 2012-10-25 21:18:39 UTC (rev 5992)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 021-array-in-proc-param.out 021-array-in-proc-param-* 021-array-in-proc-param.kml 021-array-in-proc-param.xml || exit 1
+rm -r 021-array-in-proc-param.out 021-array-in-proc-param-* 021-array-in-proc-param.kml 021-array-in-proc-param.swiftx || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/arrays/022-array-with-exprs.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/arrays/022-array-with-exprs.clean.sh 2012-10-25 20:04:32 UTC (rev 5991)
+++ branches/release-0.94/tests/language-behaviour/arrays/022-array-with-exprs.clean.sh 2012-10-25 21:18:39 UTC (rev 5992)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 022-array-with-exprs-* 022-array-with-exprs.kml 022-array-with-exprs.xml 022-array-with-exprs.out || exit 1
+rm -r 022-array-with-exprs-* 022-array-with-exprs.kml 022-array-with-exprs.swiftx 022-array-with-exprs.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/arrays/025-array-passing.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/arrays/025-array-passing.clean.sh 2012-10-25 20:04:32 UTC (rev 5991)
+++ branches/release-0.94/tests/language-behaviour/arrays/025-array-passing.clean.sh 2012-10-25 21:18:39 UTC (rev 5992)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 025-array-passing-* 025-array-passing.kml 025-array-passing.xml 025-array-passing.out || exit 1
+rm -r 025-array-passing-* 025-array-passing.kml 025-array-passing.swiftx 025-array-passing.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/arrays/027-array-assignment.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/arrays/027-array-assignment.clean.sh 2012-10-25 20:04:32 UTC (rev 5991)
+++ branches/release-0.94/tests/language-behaviour/arrays/027-array-assignment.clean.sh 2012-10-25 21:18:39 UTC (rev 5992)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 027-array-assignment.out 027-array-assignment-* 027-array-assignment.kml 027-array-assignment.xml || exit 1
+rm -r 027-array-assignment.out 027-array-assignment-* 027-array-assignment.kml 027-array-assignment.swiftx || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/cleanup/001-proc-scope-cleanup.check.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/cleanup/001-proc-scope-cleanup.check.sh 2012-10-25 20:04:32 UTC (rev 5991)
+++ branches/release-0.94/tests/language-behaviour/cleanup/001-proc-scope-cleanup.check.sh 2012-10-25 21:18:39 UTC (rev 5992)
@@ -2,8 +2,7 @@
PREFIX="001-proc-scope-cleanup"
-
-if [ -n "$(find . -name "$PREFIX.*.tmp" -print -quit)" ]; then
+if [ -n "$(find . -maxdepth 1 -name "$PREFIX.*.tmp" -print -quit)" ]; then
echo "A temporary file wasn't removed"
exit 1
fi
@@ -13,12 +12,12 @@
exit 1
fi
-if ! grep "Cleaning file.*$PREFIX.t1.tmp.*" $OUTPUT; then
+if ! grep "Cleaning file [file://*$PREFIX.t1.tmp*]" $PREFIX.stdout; then
echo "Test mapper did not claim to clean t1"
exit 1
fi
-if ! grep "Not cleaning file.*$PREFIX.t2.out.*" $OUTPUT; then
+if ! grep "Not cleaning [file://*$PREFIX.t2.out*]" $PREFIX.stdout; then
echo "Test mapper did not identify t2 as persistent"
exit 1
fi
@@ -29,4 +28,4 @@
fi
echo "Everything's ok"
-exit 0
\ No newline at end of file
+exit 0
Modified: branches/release-0.94/tests/language-behaviour/cleanup/011-proc-scope-alias-cleanup.check.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/cleanup/011-proc-scope-alias-cleanup.check.sh 2012-10-25 20:04:32 UTC (rev 5991)
+++ branches/release-0.94/tests/language-behaviour/cleanup/011-proc-scope-alias-cleanup.check.sh 2012-10-25 21:18:39 UTC (rev 5992)
@@ -2,7 +2,7 @@
PREFIX="011-proc-scope-alias-cleanup"
-if [ -n "$(find . -name "$PREFIX.*.tmp" -print -quit)" ]; then
+if [ -n "$(find . -maxdepth 1 -name "$PREFIX.*.tmp" -print -quit)" ]; then
echo "A temporary file wasn't removed"
exit 1
fi
@@ -12,17 +12,17 @@
exit 1
fi
-if ! grep "Remapping" $OUTPUT; then
+if ! grep "Remapping" $PREFIX.stdout; then
echo "Test mapper did not claim to have remapped anything"
exit 1
fi
-if ! grep "Cleaning file.*$PREFIX.1.tmp.*" $OUTPUT; then
+if ! grep "Cleaning file [file://*$PREFIX.1.tmp*]" $PREFIX.stdout; then
echo "Test mapper didn't clean what it should have"
exit 1
fi
-if ! grep "Not cleaning file.*$PREFIX.2.out.*" $OUTPUT; then
+if ! grep "Not cleaning [file://*$PREFIX.2.out*]" $PREFIX.stdout; then
echo "Test mapper did not identify 2 as persistent"
exit 1
fi
@@ -33,4 +33,4 @@
fi
echo "Everything's ok"
-exit 0
\ No newline at end of file
+exit 0
Modified: branches/release-0.94/tests/language-behaviour/cleanup/021-iter-scope-cleanup.check.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/cleanup/021-iter-scope-cleanup.check.sh 2012-10-25 20:04:32 UTC (rev 5991)
+++ branches/release-0.94/tests/language-behaviour/cleanup/021-iter-scope-cleanup.check.sh 2012-10-25 21:18:39 UTC (rev 5992)
@@ -7,10 +7,10 @@
exit 1
fi
-if [ `grep "Cleaning" $OUTPUT | wc -l` != "3" ]; then
+if [ `grep "Cleaning" $PREFIX.stdout | wc -l` != "3" ]; then
echo "Wrong number of files cleaned"
exit 1
fi
echo "Everything's ok"
-exit 0
\ No newline at end of file
+exit 0
Modified: branches/release-0.94/tests/language-behaviour/cleanup/031-foreach-scope-cleanup.check.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/cleanup/031-foreach-scope-cleanup.check.sh 2012-10-25 20:04:32 UTC (rev 5991)
+++ branches/release-0.94/tests/language-behaviour/cleanup/031-foreach-scope-cleanup.check.sh 2012-10-25 21:18:39 UTC (rev 5992)
@@ -7,10 +7,10 @@
exit 1
fi
-if [ `grep "Cleaning" $OUTPUT | wc -l` != "4" ]; then
+if [ `grep "Cleaning" $PREFIX.stdout | wc -l` != "4" ]; then
echo "Wrong number of files cleaned"
exit 1
fi
echo "Everything's ok"
-exit 0
\ No newline at end of file
+exit 0
Modified: branches/release-0.94/tests/language-behaviour/cleanup/041-if-scope-cleanup.check.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/cleanup/041-if-scope-cleanup.check.sh 2012-10-25 20:04:32 UTC (rev 5991)
+++ branches/release-0.94/tests/language-behaviour/cleanup/041-if-scope-cleanup.check.sh 2012-10-25 21:18:39 UTC (rev 5992)
@@ -12,10 +12,10 @@
exit 1
fi
-if [ `grep "Cleaning" $OUTPUT | wc -l` != "2" ]; then
+if [ `grep "Cleaning" $PREFIX.stdout | wc -l` != "2" ]; then
echo "Wrong number of files cleaned"
exit 1
fi
echo "Everything's ok"
-exit 0
\ No newline at end of file
+exit 0
More information about the Swift-commit
mailing list