[Swift-commit] r3591 - in trunk/tests: cdm local

[noreply at svn.ci.uchicago.edu]

Author: wozniak
Date: 2010-08-31 16:38:21 -0500 (Tue, 31 Aug 2010)
New Revision: 3591

Modified:
   trunk/tests/cdm/201-direct-output.swift
   trunk/tests/local/diamond.check.sh
   trunk/tests/local/range.check.sh
Log:
tests fixes


Modified: trunk/tests/cdm/201-direct-output.swift
===================================================================
--- trunk/tests/cdm/201-direct-output.swift	2010-08-31 21:38:01 UTC (rev 3590)
+++ trunk/tests/cdm/201-direct-output.swift	2010-08-31 21:38:21 UTC (rev 3591)
@@ -9,6 +9,6 @@
 file f1<"201-input.txt">;
 
 // Will be transformed by CDM to 201/output.txt:
-file f2<"output.txt">;
+file f2<"201-output.txt">;
 
 f2 = copy(f1);

Modified: trunk/tests/local/diamond.check.sh
===================================================================
--- trunk/tests/local/diamond.check.sh	2010-08-31 21:38:01 UTC (rev 3590)
+++ trunk/tests/local/diamond.check.sh	2010-08-31 21:38:21 UTC (rev 3591)
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 set -x
 
-COUNT=( $( ls f*.txt ) )
+COUNT=( $( ls f[a-d].txt ) )
 (( ${#COUNT[@]} == 4 )) || exit 1
 
 LINES=$( wc -l < fd.txt )

Modified: trunk/tests/local/range.check.sh
===================================================================
--- trunk/tests/local/range.check.sh	2010-08-31 21:38:01 UTC (rev 3590)
+++ trunk/tests/local/range.check.sh	2010-08-31 21:38:21 UTC (rev 3591)
@@ -4,7 +4,7 @@
 
 ls stdout.txt || exit 1
 
-COUNT=$( grep -c "num:" < stdout.txt )
+COUNT=$( grep -c "trace:" stdout.txt )
 (( $COUNT == 11 )) || exit 1
 
 exit 0