[Swift-commit] r3634 - in trunk/tests: . language-behaviour
noreply at svn.ci.uchicago.edu
noreply at svn.ci.uchicago.edu
Tue Sep 21 14:00:50 CDT 2010
Author: wozniak
Date: 2010-09-21 14:00:46 -0500 (Tue, 21 Sep 2010)
New Revision: 3634
Added:
trunk/tests/language-behaviour/00261-function-param-file.clean.sh
trunk/tests/language-behaviour/00261-function-param-file.setup.sh
trunk/tests/language-behaviour/00262-function-param-file-many.clean.sh
trunk/tests/language-behaviour/00262-function-param-file-many.setup.sh
trunk/tests/language-behaviour/060-duplicate.check.sh
trunk/tests/language-behaviour/060-duplicate.clean.sh
trunk/tests/language-behaviour/060-duplicate.setup.sh
trunk/tests/language-behaviour/061-cattwo.clean.sh
trunk/tests/language-behaviour/061-cattwo.setup.sh
trunk/tests/language-behaviour/066-many.check.sh
trunk/tests/language-behaviour/066-many.clean.sh
trunk/tests/language-behaviour/066-many.time
trunk/tests/language-behaviour/tc.template.data
trunk/tests/language-behaviour/title.txt
Modified:
trunk/tests/language-behaviour/065-delay.swift
trunk/tests/language-behaviour/0651-several-delay.swift
trunk/tests/language-behaviour/066-many.swift
trunk/tests/nightly.sh
Log:
Test fixes
Added: trunk/tests/language-behaviour/00261-function-param-file.clean.sh
===================================================================
--- trunk/tests/language-behaviour/00261-function-param-file.clean.sh (rev 0)
+++ trunk/tests/language-behaviour/00261-function-param-file.clean.sh 2010-09-21 19:00:46 UTC (rev 3634)
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+rm -v 00261-function-param-file.in || exit 1
+
+exit 0
Property changes on: trunk/tests/language-behaviour/00261-function-param-file.clean.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/tests/language-behaviour/00261-function-param-file.setup.sh
===================================================================
--- trunk/tests/language-behaviour/00261-function-param-file.setup.sh (rev 0)
+++ trunk/tests/language-behaviour/00261-function-param-file.setup.sh 2010-09-21 19:00:46 UTC (rev 3634)
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+cp -v ${GROUP}/00261-function-param-file.in . || exit 1
+
+exit 0
Property changes on: trunk/tests/language-behaviour/00261-function-param-file.setup.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/tests/language-behaviour/00262-function-param-file-many.clean.sh
===================================================================
--- trunk/tests/language-behaviour/00262-function-param-file-many.clean.sh (rev 0)
+++ trunk/tests/language-behaviour/00262-function-param-file-many.clean.sh 2010-09-21 19:00:46 UTC (rev 3634)
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+rm -v 00262-function-param-file-many.in || exit 1
+
+exit 0
Property changes on: trunk/tests/language-behaviour/00262-function-param-file-many.clean.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/tests/language-behaviour/00262-function-param-file-many.setup.sh
===================================================================
--- trunk/tests/language-behaviour/00262-function-param-file-many.setup.sh (rev 0)
+++ trunk/tests/language-behaviour/00262-function-param-file-many.setup.sh 2010-09-21 19:00:46 UTC (rev 3634)
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+cp -v ${GROUP}/00262-function-param-file-many.in . || exit 1
+
+exit 0
Property changes on: trunk/tests/language-behaviour/00262-function-param-file-many.setup.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/tests/language-behaviour/060-duplicate.check.sh
===================================================================
--- trunk/tests/language-behaviour/060-duplicate.check.sh (rev 0)
+++ trunk/tests/language-behaviour/060-duplicate.check.sh 2010-09-21 19:00:46 UTC (rev 3634)
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+grep 060-duplicate.in 060-duplicate.out || exit 1
+
+exit 0
Property changes on: trunk/tests/language-behaviour/060-duplicate.check.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/tests/language-behaviour/060-duplicate.clean.sh
===================================================================
--- trunk/tests/language-behaviour/060-duplicate.clean.sh (rev 0)
+++ trunk/tests/language-behaviour/060-duplicate.clean.sh 2010-09-21 19:00:46 UTC (rev 3634)
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+rm -v 060-duplicate.in || exit 1
+rm -v 060-duplicate.out || exit 1
+
+exit 0
Property changes on: trunk/tests/language-behaviour/060-duplicate.clean.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/tests/language-behaviour/060-duplicate.setup.sh
===================================================================
--- trunk/tests/language-behaviour/060-duplicate.setup.sh (rev 0)
+++ trunk/tests/language-behaviour/060-duplicate.setup.sh 2010-09-21 19:00:46 UTC (rev 3634)
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+cp -v ${GROUP}/060-duplicate.in . || exit 1
+
+exit 0
Property changes on: trunk/tests/language-behaviour/060-duplicate.setup.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/tests/language-behaviour/061-cattwo.clean.sh
===================================================================
--- trunk/tests/language-behaviour/061-cattwo.clean.sh (rev 0)
+++ trunk/tests/language-behaviour/061-cattwo.clean.sh 2010-09-21 19:00:46 UTC (rev 3634)
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -x
+
+rm 061-cattwo.[12].in || exit 1
+
+exit 0
Property changes on: trunk/tests/language-behaviour/061-cattwo.clean.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/tests/language-behaviour/061-cattwo.setup.sh
===================================================================
--- trunk/tests/language-behaviour/061-cattwo.setup.sh (rev 0)
+++ trunk/tests/language-behaviour/061-cattwo.setup.sh 2010-09-21 19:00:46 UTC (rev 3634)
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -x
+
+cp ${GROUP}/061-cattwo.[12].in . || exit 1
+
+exit 0
Property changes on: trunk/tests/language-behaviour/061-cattwo.setup.sh
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/tests/language-behaviour/065-delay.swift
===================================================================
--- trunk/tests/language-behaviour/065-delay.swift 2010-09-21 18:57:45 UTC (rev 3633)
+++ trunk/tests/language-behaviour/065-delay.swift 2010-09-21 19:00:46 UTC (rev 3634)
@@ -1,9 +1,6 @@
-delay() {
- app {
- sleep "90s";
- }
+app delay() {
+ sleep "3";
}
delay();
-
Modified: trunk/tests/language-behaviour/0651-several-delay.swift
===================================================================
--- trunk/tests/language-behaviour/0651-several-delay.swift 2010-09-21 18:57:45 UTC (rev 3633)
+++ trunk/tests/language-behaviour/0651-several-delay.swift 2010-09-21 19:00:46 UTC (rev 3634)
@@ -1,10 +1,8 @@
-delay() {
- app {
- sleep "90s";
- }
+app delay(int i) {
+ sleep i;
}
-foreach i in [1:10] {
-delay();
+foreach i in [1:3] {
+ delay(i);
}
Added: trunk/tests/language-behaviour/066-many.check.sh
===================================================================
--- trunk/tests/language-behaviour/066-many.check.sh (rev 0)
+++ trunk/tests/language-behaviour/066-many.check.sh 2010-09-21 19:00:46 UTC (rev 3634)
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -x
+
+[ -f nop ] || exit 1
+
+exit 0
Property changes on: trunk/tests/language-behaviour/066-many.check.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/tests/language-behaviour/066-many.clean.sh
===================================================================
--- trunk/tests/language-behaviour/066-many.clean.sh (rev 0)
+++ trunk/tests/language-behaviour/066-many.clean.sh 2010-09-21 19:00:46 UTC (rev 3634)
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -x
+
+rm -v nop || exit 1
+
+exit 0
Property changes on: trunk/tests/language-behaviour/066-many.clean.sh
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/tests/language-behaviour/066-many.swift
===================================================================
--- trunk/tests/language-behaviour/066-many.swift 2010-09-21 18:57:45 UTC (rev 3633)
+++ trunk/tests/language-behaviour/066-many.swift 2010-09-21 19:00:46 UTC (rev 3634)
@@ -1,8 +1,7 @@
-p() {
- app {
- touch "nop";
- }
+app p()
+{
+ touch "nop";
}
foreach i in [1:3000] {
Added: trunk/tests/language-behaviour/066-many.time
===================================================================
--- trunk/tests/language-behaviour/066-many.time (rev 0)
+++ trunk/tests/language-behaviour/066-many.time 2010-09-21 19:00:46 UTC (rev 3634)
@@ -0,0 +1 @@
+300
Added: trunk/tests/language-behaviour/tc.template.data
===================================================================
--- trunk/tests/language-behaviour/tc.template.data (rev 0)
+++ trunk/tests/language-behaviour/tc.template.data 2010-09-21 19:00:46 UTC (rev 3634)
@@ -0,0 +1,20 @@
+#This is the transformation catalog.
+#
+#It comes pre-configured with a number of simple transformations with
+#paths that are likely to work on a linux box. However, on some systems,
+#the paths to these executables will be different (for example, sometimes
+#some of these programs are found in /usr/bin rather than in /bin)
+#
+#NOTE WELL: fields in this file must be separated by tabs, not spaces; and
+#there must be no trailing whitespace at the end of each line.
+#
+# sitename transformation path INSTALLED platform profiles
+localhost echo /bin/echo INSTALLED INTEL32::LINUX null
+localhost cat /bin/cat INSTALLED INTEL32::LINUX null
+localhost ls /bin/ls INSTALLED INTEL32::LINUX null
+localhost grep /bin/grep INSTALLED INTEL32::LINUX null
+localhost sort /bin/sort INSTALLED INTEL32::LINUX null
+localhost paste /bin/paste INSTALLED INTEL32::LINUX null
+localhost cp /bin/cp INSTALLED INTEL32::LINUX null
+localhost sleep /bin/sleep INSTALLED INTEL32::LINUX null
+localhost touch /bin/touch INSTALLED INTEL32::LINUX null
Added: trunk/tests/language-behaviour/title.txt
===================================================================
--- trunk/tests/language-behaviour/title.txt (rev 0)
+++ trunk/tests/language-behaviour/title.txt 2010-09-21 19:00:46 UTC (rev 3634)
@@ -0,0 +1 @@
+Language-behaviour tests
Modified: trunk/tests/nightly.sh
===================================================================
--- trunk/tests/nightly.sh 2010-09-21 18:57:45 UTC (rev 3633)
+++ trunk/tests/nightly.sh 2010-09-21 19:00:46 UTC (rev 3634)
@@ -22,14 +22,16 @@
# Each *.swift test may be accompanied by a
# *.setup.sh, *.check.sh, and/or *.clean.sh script
# These may setup and inspect files in RUNDIR including exec.out
+# The GROUP scripts can read the GROUP variable
# Tests are GROUPed into directories
# Each GROUP directory has:
# 1) a list of *.swift tests (plus *.sh scripts)
# 2) optionally a tc.template.data
-# 3) optionally a swift.properties
-# 4) optionally a title.txt
-# 5) preferably a README.txt
+# 3) optionally a fs.template.data
+# 4) optionally a swift.properties
+# 5) optionally a title.txt
+# 6) preferably a README.txt
# OUTPUT is the stdout of the current test
# stdout.txt retains stdout from the previous test (for *.clean.sh)
More information about the Swift-commit
mailing list