[Swift-commit] r4964 - in branches/release-0.93/tests: . language-behaviour/math

davidk at ci.uchicago.edu davidk at ci.uchicago.edu
Mon Aug 8 11:33:47 CDT 2011


Author: davidk
Date: 2011-08-08 11:33:46 -0500 (Mon, 08 Aug 2011)
New Revision: 4964

Added:
   branches/release-0.93/tests/language-behaviour/math/006-add.out.expected
   branches/release-0.93/tests/language-behaviour/math/008-add-multiply.out.expected
   branches/release-0.93/tests/language-behaviour/math/009-multiply.out.expected
   branches/release-0.93/tests/language-behaviour/math/010-divide.out.expected
   branches/release-0.93/tests/language-behaviour/math/011-divide-float.out.expected
   branches/release-0.93/tests/language-behaviour/math/013-mod.out.expected
   branches/release-0.93/tests/language-behaviour/math/014-subtract.out.expected
   branches/release-0.93/tests/language-behaviour/math/0145-unary-subtact.out.expected
   branches/release-0.93/tests/language-behaviour/math/015-lesseq.out.expected
   branches/release-0.93/tests/language-behaviour/math/016-greatereq.out.expected
   branches/release-0.93/tests/language-behaviour/math/017-greater.out.expected
   branches/release-0.93/tests/language-behaviour/math/018-less.out.expected
   branches/release-0.93/tests/language-behaviour/math/019-equals.out.expected
   branches/release-0.93/tests/language-behaviour/math/0191-not-equals.out.expected
   branches/release-0.93/tests/language-behaviour/math/030-mix-float-int.out.expected
   branches/release-0.93/tests/language-behaviour/math/031-add-float.out.expected
Removed:
   branches/release-0.93/tests/language-behaviour/math/006-add.check.sh
   branches/release-0.93/tests/language-behaviour/math/007-add-in-proc-add.check.sh
   branches/release-0.93/tests/language-behaviour/math/008-add-multiply.check.sh
   branches/release-0.93/tests/language-behaviour/math/009-multiply.check.sh
   branches/release-0.93/tests/language-behaviour/math/010-divide.check.sh
   branches/release-0.93/tests/language-behaviour/math/011-divide-float.check.sh
   branches/release-0.93/tests/language-behaviour/math/013-mod.check.sh
   branches/release-0.93/tests/language-behaviour/math/014-subtract.check.sh
   branches/release-0.93/tests/language-behaviour/math/0145-unary-subtact.check.sh
   branches/release-0.93/tests/language-behaviour/math/015-lesseq.check.sh
   branches/release-0.93/tests/language-behaviour/math/016-greatereq.check.sh
   branches/release-0.93/tests/language-behaviour/math/017-greater.check.sh
   branches/release-0.93/tests/language-behaviour/math/018-less.check.sh
   branches/release-0.93/tests/language-behaviour/math/019-equals.check.sh
   branches/release-0.93/tests/language-behaviour/math/0191-not-equals.check.sh
   branches/release-0.93/tests/language-behaviour/math/030-mix-float-int.check.sh
   branches/release-0.93/tests/language-behaviour/math/031-add-float.check.sh
Modified:
   branches/release-0.93/tests/suite.sh
Log:
Replace check scripts, which used grep, with .expected files for exact matches


Deleted: branches/release-0.93/tests/language-behaviour/math/006-add.check.sh
===================================================================
--- branches/release-0.93/tests/language-behaviour/math/006-add.check.sh	2011-08-08 03:38:30 UTC (rev 4963)
+++ branches/release-0.93/tests/language-behaviour/math/006-add.check.sh	2011-08-08 16:33:46 UTC (rev 4964)
@@ -1,8 +0,0 @@
-#!/bin/bash
-set -x
-(cat 006-add.out | grep 135) || exit 1
-exit 0
-#!/bin/bash
-set -x
-cat 006-add.out | grep || exit 1
-exit 0

Added: branches/release-0.93/tests/language-behaviour/math/006-add.out.expected
===================================================================
--- branches/release-0.93/tests/language-behaviour/math/006-add.out.expected	                        (rev 0)
+++ branches/release-0.93/tests/language-behaviour/math/006-add.out.expected	2011-08-08 16:33:46 UTC (rev 4964)
@@ -0,0 +1 @@
+135

Deleted: branches/release-0.93/tests/language-behaviour/math/007-add-in-proc-add.check.sh
===================================================================
--- branches/release-0.93/tests/language-behaviour/math/007-add-in-proc-add.check.sh	2011-08-08 03:38:30 UTC (rev 4963)
+++ branches/release-0.93/tests/language-behaviour/math/007-add-in-proc-add.check.sh	2011-08-08 16:33:46 UTC (rev 4964)
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -x
-cat 007-add-in-proc-add.out | grep 189|| exit 1
-exit 0

Deleted: branches/release-0.93/tests/language-behaviour/math/008-add-multiply.check.sh
===================================================================
--- branches/release-0.93/tests/language-behaviour/math/008-add-multiply.check.sh	2011-08-08 03:38:30 UTC (rev 4963)
+++ branches/release-0.93/tests/language-behaviour/math/008-add-multiply.check.sh	2011-08-08 16:33:46 UTC (rev 4964)
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -x
-cat 008-add-multiply.out | grep 8|| exit 1
-exit 0

Added: branches/release-0.93/tests/language-behaviour/math/008-add-multiply.out.expected
===================================================================
--- branches/release-0.93/tests/language-behaviour/math/008-add-multiply.out.expected	                        (rev 0)
+++ branches/release-0.93/tests/language-behaviour/math/008-add-multiply.out.expected	2011-08-08 16:33:46 UTC (rev 4964)
@@ -0,0 +1 @@
+8

Deleted: branches/release-0.93/tests/language-behaviour/math/009-multiply.check.sh
===================================================================
--- branches/release-0.93/tests/language-behaviour/math/009-multiply.check.sh	2011-08-08 03:38:30 UTC (rev 4963)
+++ branches/release-0.93/tests/language-behaviour/math/009-multiply.check.sh	2011-08-08 16:33:46 UTC (rev 4964)
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -x
-cat 009-multiply.out | grep 42|| exit 1
-exit 0

Added: branches/release-0.93/tests/language-behaviour/math/009-multiply.out.expected
===================================================================
--- branches/release-0.93/tests/language-behaviour/math/009-multiply.out.expected	                        (rev 0)
+++ branches/release-0.93/tests/language-behaviour/math/009-multiply.out.expected	2011-08-08 16:33:46 UTC (rev 4964)
@@ -0,0 +1 @@
+42

Deleted: branches/release-0.93/tests/language-behaviour/math/010-divide.check.sh
===================================================================
--- branches/release-0.93/tests/language-behaviour/math/010-divide.check.sh	2011-08-08 03:38:30 UTC (rev 4963)
+++ branches/release-0.93/tests/language-behaviour/math/010-divide.check.sh	2011-08-08 16:33:46 UTC (rev 4964)
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -x
-cat 010-divide.out | grep 33|| exit 1
-exit 0

Added: branches/release-0.93/tests/language-behaviour/math/010-divide.out.expected
===================================================================
--- branches/release-0.93/tests/language-behaviour/math/010-divide.out.expected	                        (rev 0)
+++ branches/release-0.93/tests/language-behaviour/math/010-divide.out.expected	2011-08-08 16:33:46 UTC (rev 4964)
@@ -0,0 +1 @@
+33

Deleted: branches/release-0.93/tests/language-behaviour/math/011-divide-float.check.sh
===================================================================
--- branches/release-0.93/tests/language-behaviour/math/011-divide-float.check.sh	2011-08-08 03:38:30 UTC (rev 4963)
+++ branches/release-0.93/tests/language-behaviour/math/011-divide-float.check.sh	2011-08-08 16:33:46 UTC (rev 4964)
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -x
-cat 011-divide-float.out | grep 0.3333333333333333|| exit 1
-exit 0

Added: branches/release-0.93/tests/language-behaviour/math/011-divide-float.out.expected
===================================================================
--- branches/release-0.93/tests/language-behaviour/math/011-divide-float.out.expected	                        (rev 0)
+++ branches/release-0.93/tests/language-behaviour/math/011-divide-float.out.expected	2011-08-08 16:33:46 UTC (rev 4964)
@@ -0,0 +1 @@
+0.3333333333333333

Deleted: branches/release-0.93/tests/language-behaviour/math/013-mod.check.sh
===================================================================
--- branches/release-0.93/tests/language-behaviour/math/013-mod.check.sh	2011-08-08 03:38:30 UTC (rev 4963)
+++ branches/release-0.93/tests/language-behaviour/math/013-mod.check.sh	2011-08-08 16:33:46 UTC (rev 4964)
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -x
-cat 013-mod.out | grep 19|| exit 1
-exit 0

Added: branches/release-0.93/tests/language-behaviour/math/013-mod.out.expected
===================================================================
--- branches/release-0.93/tests/language-behaviour/math/013-mod.out.expected	                        (rev 0)
+++ branches/release-0.93/tests/language-behaviour/math/013-mod.out.expected	2011-08-08 16:33:46 UTC (rev 4964)
@@ -0,0 +1 @@
+19

Deleted: branches/release-0.93/tests/language-behaviour/math/014-subtract.check.sh
===================================================================
--- branches/release-0.93/tests/language-behaviour/math/014-subtract.check.sh	2011-08-08 03:38:30 UTC (rev 4963)
+++ branches/release-0.93/tests/language-behaviour/math/014-subtract.check.sh	2011-08-08 16:33:46 UTC (rev 4964)
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -x
-cat 014-subtract.out | grep '\-37'|| exit 1
-exit 0

Added: branches/release-0.93/tests/language-behaviour/math/014-subtract.out.expected
===================================================================
--- branches/release-0.93/tests/language-behaviour/math/014-subtract.out.expected	                        (rev 0)
+++ branches/release-0.93/tests/language-behaviour/math/014-subtract.out.expected	2011-08-08 16:33:46 UTC (rev 4964)
@@ -0,0 +1 @@
+-37

Deleted: branches/release-0.93/tests/language-behaviour/math/0145-unary-subtact.check.sh
===================================================================
--- branches/release-0.93/tests/language-behaviour/math/0145-unary-subtact.check.sh	2011-08-08 03:38:30 UTC (rev 4963)
+++ branches/release-0.93/tests/language-behaviour/math/0145-unary-subtact.check.sh	2011-08-08 16:33:46 UTC (rev 4964)
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -x
-cat 0145-unary-subtact.out | grep '\-989929'|| exit 1
-exit 0

Added: branches/release-0.93/tests/language-behaviour/math/0145-unary-subtact.out.expected
===================================================================
--- branches/release-0.93/tests/language-behaviour/math/0145-unary-subtact.out.expected	                        (rev 0)
+++ branches/release-0.93/tests/language-behaviour/math/0145-unary-subtact.out.expected	2011-08-08 16:33:46 UTC (rev 4964)
@@ -0,0 +1 @@
+-989929

Deleted: branches/release-0.93/tests/language-behaviour/math/015-lesseq.check.sh
===================================================================
--- branches/release-0.93/tests/language-behaviour/math/015-lesseq.check.sh	2011-08-08 03:38:30 UTC (rev 4963)
+++ branches/release-0.93/tests/language-behaviour/math/015-lesseq.check.sh	2011-08-08 16:33:46 UTC (rev 4964)
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -x
-cat 015-lesseq.out | grep true|| exit 1
-exit 0

Added: branches/release-0.93/tests/language-behaviour/math/015-lesseq.out.expected
===================================================================
--- branches/release-0.93/tests/language-behaviour/math/015-lesseq.out.expected	                        (rev 0)
+++ branches/release-0.93/tests/language-behaviour/math/015-lesseq.out.expected	2011-08-08 16:33:46 UTC (rev 4964)
@@ -0,0 +1 @@
+true

Deleted: branches/release-0.93/tests/language-behaviour/math/016-greatereq.check.sh
===================================================================
--- branches/release-0.93/tests/language-behaviour/math/016-greatereq.check.sh	2011-08-08 03:38:30 UTC (rev 4963)
+++ branches/release-0.93/tests/language-behaviour/math/016-greatereq.check.sh	2011-08-08 16:33:46 UTC (rev 4964)
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -x
-cat 016-greatereq.out | grep false|| exit 1
-exit 0

Added: branches/release-0.93/tests/language-behaviour/math/016-greatereq.out.expected
===================================================================
--- branches/release-0.93/tests/language-behaviour/math/016-greatereq.out.expected	                        (rev 0)
+++ branches/release-0.93/tests/language-behaviour/math/016-greatereq.out.expected	2011-08-08 16:33:46 UTC (rev 4964)
@@ -0,0 +1 @@
+false

Deleted: branches/release-0.93/tests/language-behaviour/math/017-greater.check.sh
===================================================================
--- branches/release-0.93/tests/language-behaviour/math/017-greater.check.sh	2011-08-08 03:38:30 UTC (rev 4963)
+++ branches/release-0.93/tests/language-behaviour/math/017-greater.check.sh	2011-08-08 16:33:46 UTC (rev 4964)
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -x
-cat 017-greater.out | grep false|| exit 1
-exit 0

Added: branches/release-0.93/tests/language-behaviour/math/017-greater.out.expected
===================================================================
--- branches/release-0.93/tests/language-behaviour/math/017-greater.out.expected	                        (rev 0)
+++ branches/release-0.93/tests/language-behaviour/math/017-greater.out.expected	2011-08-08 16:33:46 UTC (rev 4964)
@@ -0,0 +1 @@
+false

Deleted: branches/release-0.93/tests/language-behaviour/math/018-less.check.sh
===================================================================
--- branches/release-0.93/tests/language-behaviour/math/018-less.check.sh	2011-08-08 03:38:30 UTC (rev 4963)
+++ branches/release-0.93/tests/language-behaviour/math/018-less.check.sh	2011-08-08 16:33:46 UTC (rev 4964)
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -x
-cat 018-less.out | grep true|| exit 1
-exit 0

Added: branches/release-0.93/tests/language-behaviour/math/018-less.out.expected
===================================================================
--- branches/release-0.93/tests/language-behaviour/math/018-less.out.expected	                        (rev 0)
+++ branches/release-0.93/tests/language-behaviour/math/018-less.out.expected	2011-08-08 16:33:46 UTC (rev 4964)
@@ -0,0 +1 @@
+true

Deleted: branches/release-0.93/tests/language-behaviour/math/019-equals.check.sh
===================================================================
--- branches/release-0.93/tests/language-behaviour/math/019-equals.check.sh	2011-08-08 03:38:30 UTC (rev 4963)
+++ branches/release-0.93/tests/language-behaviour/math/019-equals.check.sh	2011-08-08 16:33:46 UTC (rev 4964)
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -x
-cat 019-equals.out | grep false|| exit 1
-exit 0

Added: branches/release-0.93/tests/language-behaviour/math/019-equals.out.expected
===================================================================
--- branches/release-0.93/tests/language-behaviour/math/019-equals.out.expected	                        (rev 0)
+++ branches/release-0.93/tests/language-behaviour/math/019-equals.out.expected	2011-08-08 16:33:46 UTC (rev 4964)
@@ -0,0 +1 @@
+false

Deleted: branches/release-0.93/tests/language-behaviour/math/0191-not-equals.check.sh
===================================================================
--- branches/release-0.93/tests/language-behaviour/math/0191-not-equals.check.sh	2011-08-08 03:38:30 UTC (rev 4963)
+++ branches/release-0.93/tests/language-behaviour/math/0191-not-equals.check.sh	2011-08-08 16:33:46 UTC (rev 4964)
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -x
-cat 0191-not-equals.out | grep true || exit 1
-exit 0

Added: branches/release-0.93/tests/language-behaviour/math/0191-not-equals.out.expected
===================================================================
--- branches/release-0.93/tests/language-behaviour/math/0191-not-equals.out.expected	                        (rev 0)
+++ branches/release-0.93/tests/language-behaviour/math/0191-not-equals.out.expected	2011-08-08 16:33:46 UTC (rev 4964)
@@ -0,0 +1 @@
+true

Deleted: branches/release-0.93/tests/language-behaviour/math/030-mix-float-int.check.sh
===================================================================
--- branches/release-0.93/tests/language-behaviour/math/030-mix-float-int.check.sh	2011-08-08 03:38:30 UTC (rev 4963)
+++ branches/release-0.93/tests/language-behaviour/math/030-mix-float-int.check.sh	2011-08-08 16:33:46 UTC (rev 4964)
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -x
-cat 030-mix-float-int.out | grep 54.3|| exit 1
-exit 0

Added: branches/release-0.93/tests/language-behaviour/math/030-mix-float-int.out.expected
===================================================================
--- branches/release-0.93/tests/language-behaviour/math/030-mix-float-int.out.expected	                        (rev 0)
+++ branches/release-0.93/tests/language-behaviour/math/030-mix-float-int.out.expected	2011-08-08 16:33:46 UTC (rev 4964)
@@ -0,0 +1 @@
+54.3

Deleted: branches/release-0.93/tests/language-behaviour/math/031-add-float.check.sh
===================================================================
--- branches/release-0.93/tests/language-behaviour/math/031-add-float.check.sh	2011-08-08 03:38:30 UTC (rev 4963)
+++ branches/release-0.93/tests/language-behaviour/math/031-add-float.check.sh	2011-08-08 16:33:46 UTC (rev 4964)
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -x
-cat 031-add-float.out | grep 135.3|| exit 1
-exit 0

Added: branches/release-0.93/tests/language-behaviour/math/031-add-float.out.expected
===================================================================
--- branches/release-0.93/tests/language-behaviour/math/031-add-float.out.expected	                        (rev 0)
+++ branches/release-0.93/tests/language-behaviour/math/031-add-float.out.expected	2011-08-08 16:33:46 UTC (rev 4964)
@@ -0,0 +1 @@
+135.3

Modified: branches/release-0.93/tests/suite.sh
===================================================================
--- branches/release-0.93/tests/suite.sh	2011-08-08 03:38:30 UTC (rev 4963)
+++ branches/release-0.93/tests/suite.sh	2011-08-08 16:33:46 UTC (rev 4964)
@@ -1025,7 +1025,7 @@
 	PIECES=""
 	while [ "$G" != "$CRTDIR" ]; do
 		PIECE=`basename $G`
-		PIECES="$PIECE $PIECES"
+		PIECES="$PIECE/$PIECES"
 		G=`dirname $G`
 	done
 	echo $PIECES




More information about the Swift-commit mailing list