[Swift-commit] r5547 - in trunk/tests: . bugs

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2012-02-04 17:45:26 -0600 (Sat, 04 Feb 2012)
New Revision: 5547

Modified:
   trunk/tests/bugs/481-array-hang.swift
   trunk/tests/suite.sh
Log:
Fix for suite.sh which had some svn merge info


Modified: trunk/tests/bugs/481-array-hang.swift
===================================================================
--- trunk/tests/bugs/481-array-hang.swift	2012-02-03 22:14:30 UTC (rev 5546)
+++ trunk/tests/bugs/481-array-hang.swift	2012-02-04 23:45:26 UTC (rev 5547)
@@ -1,4 +1,5 @@
 int[] a = [1, 2, 3];
 
+// _THIS-SCRIPT-SHOULD-FAIL_
 // hangs waiting for a[4]
-trace(a[4]);
\ No newline at end of file
+trace(a[4]);

Modified: trunk/tests/suite.sh
===================================================================
--- trunk/tests/suite.sh	2012-02-03 22:14:30 UTC (rev 5546)
+++ trunk/tests/suite.sh	2012-02-04 23:45:26 UTC (rev 5547)
@@ -584,13 +584,8 @@
   fi
 
   RESULT=$( result )
-<<<<<<< .working
   output_report test $SEQ "$LASTCMD" $RESULT $OUTPUT
-=======
->>>>>>> .merge-right.r5122
 
-  output_report test $SEQ "$LASTCMD" $RESULT $OUTPUT
-
   check_bailout
 
   let "SEQ=$SEQ+1"