[Swift-commit] r3446 - in branches/tests-01/tests: . language/should-not-work
noreply at svn.ci.uchicago.edu
noreply at svn.ci.uchicago.edu
Mon Jul 19 16:10:02 CDT 2010
Author: wozniak
Date: 2010-07-19 16:10:01 -0500 (Mon, 19 Jul 2010)
New Revision: 3446
Added:
branches/tests-01/tests/array_iteration.swift
branches/tests-01/tests/array_wildcard.swift
branches/tests-01/tests/arraymapper.swift
branches/tests-01/tests/default.swift
branches/tests-01/tests/diamond.swift
branches/tests-01/tests/file_counter.swift
branches/tests-01/tests/hello.swift
branches/tests-01/tests/helloworld.swift
branches/tests-01/tests/helloworld_named.swift
branches/tests-01/tests/language/should-not-work/1151-bad-comment.swift
branches/tests-01/tests/language/should-not-work/116-keyword-misuse-in.swift
branches/tests-01/tests/language/should-not-work/117-empty-program.swift
branches/tests-01/tests/language/should-not-work/case-broken2.swift
branches/tests-01/tests/language/should-not-work/closes.swift
branches/tests-01/tests/range.swift
Removed:
branches/tests-01/tests/array_iteration.dtm
branches/tests-01/tests/array_wildcard.dtm
branches/tests-01/tests/arraymapper.dtm
branches/tests-01/tests/default.dtm
branches/tests-01/tests/diamond.dtm
branches/tests-01/tests/file_counter.dtm
branches/tests-01/tests/hello.dtm
branches/tests-01/tests/helloworld.dtm
branches/tests-01/tests/helloworld_named.dtm
branches/tests-01/tests/language/should-not-work/1151-bad-comment.dtm
branches/tests-01/tests/language/should-not-work/116-keyword-misuse-in.dtm
branches/tests-01/tests/language/should-not-work/117-empty-program.dtm
branches/tests-01/tests/language/should-not-work/case-broken2.dtm
branches/tests-01/tests/language/should-not-work/closes.dtm
branches/tests-01/tests/range.dtm
Modified:
branches/tests-01/tests/nightly.sh
Log:
Tests: *.dtm to *.swift
Deleted: branches/tests-01/tests/array_iteration.dtm
===================================================================
--- branches/tests-01/tests/array_iteration.dtm 2010-07-19 21:06:11 UTC (rev 3445)
+++ branches/tests-01/tests/array_iteration.dtm 2010-07-19 21:10:01 UTC (rev 3446)
@@ -1,17 +0,0 @@
-type file {}
-
-(file f) echo (string s) {
- app {
- echo s stdout=@filename(f);
- }
-}
-
-(file fa[]) echo_batch (string sa[]) {
- foreach string s, i in sa {
- fa[i] = echo(s);
- }
-}
-
-string sa[] = ["hello","hi there","how are you"];
-file fa[];
-fa = echo_batch(sa);
Copied: branches/tests-01/tests/array_iteration.swift (from rev 3445, branches/tests-01/tests/array_iteration.dtm)
===================================================================
--- branches/tests-01/tests/array_iteration.swift (rev 0)
+++ branches/tests-01/tests/array_iteration.swift 2010-07-19 21:10:01 UTC (rev 3446)
@@ -0,0 +1,17 @@
+type file {}
+
+(file f) echo (string s) {
+ app {
+ echo s stdout=@filename(f);
+ }
+}
+
+(file fa[]) echo_batch (string sa[]) {
+ foreach string s, i in sa {
+ fa[i] = echo(s);
+ }
+}
+
+string sa[] = ["hello","hi there","how are you"];
+file fa[];
+fa = echo_batch(sa);
Deleted: branches/tests-01/tests/array_wildcard.dtm
===================================================================
--- branches/tests-01/tests/array_wildcard.dtm 2010-07-19 21:06:11 UTC (rev 3445)
+++ branches/tests-01/tests/array_wildcard.dtm 2010-07-19 21:10:01 UTC (rev 3446)
@@ -1,13 +0,0 @@
-type file {}
-
-
-(file t) echo_wildcard (string s[]) {
- app {
- echo s[*] stdout=@filename(t);
- }
-}
-
-string greetings[] = ["how","are","you"];
-file hw = echo(greetings);
-
-
Copied: branches/tests-01/tests/array_wildcard.swift (from rev 3445, branches/tests-01/tests/array_wildcard.dtm)
===================================================================
--- branches/tests-01/tests/array_wildcard.swift (rev 0)
+++ branches/tests-01/tests/array_wildcard.swift 2010-07-19 21:10:01 UTC (rev 3446)
@@ -0,0 +1,13 @@
+type file {}
+
+
+(file t) echo_wildcard (string s[]) {
+ app {
+ echo s[*] stdout=@filename(t);
+ }
+}
+
+string greetings[] = ["how","are","you"];
+file hw = echo(greetings);
+
+
Deleted: branches/tests-01/tests/arraymapper.dtm
===================================================================
--- branches/tests-01/tests/arraymapper.dtm 2010-07-19 21:06:11 UTC (rev 3445)
+++ branches/tests-01/tests/arraymapper.dtm 2010-07-19 21:10:01 UTC (rev 3446)
@@ -1,8 +0,0 @@
-type file {};
-
-file files[]<simple_mapper;pattern="*">;
-
-foreach f in files {
- print(f);
-}
-
Copied: branches/tests-01/tests/arraymapper.swift (from rev 3445, branches/tests-01/tests/arraymapper.dtm)
===================================================================
--- branches/tests-01/tests/arraymapper.swift (rev 0)
+++ branches/tests-01/tests/arraymapper.swift 2010-07-19 21:10:01 UTC (rev 3446)
@@ -0,0 +1,8 @@
+type file {};
+
+file files[]<simple_mapper;pattern="*">;
+
+foreach f in files {
+ print(f);
+}
+
Deleted: branches/tests-01/tests/default.dtm
===================================================================
--- branches/tests-01/tests/default.dtm 2010-07-19 21:06:11 UTC (rev 3445)
+++ branches/tests-01/tests/default.dtm 2010-07-19 21:10:01 UTC (rev 3446)
@@ -1,11 +0,0 @@
-type file {}
-
-(file t) echo (string s="hello world") { //s has a default value
- app {
- echo s stdout=@filename(t); //redirect stdout to a file
- }
-}
-
-file hw1, hw2;
-hw1 = echo(); // procedure call using the default value
-hw2 = echo(s="hello again"); // using a different value
Copied: branches/tests-01/tests/default.swift (from rev 3445, branches/tests-01/tests/default.dtm)
===================================================================
--- branches/tests-01/tests/default.swift (rev 0)
+++ branches/tests-01/tests/default.swift 2010-07-19 21:10:01 UTC (rev 3446)
@@ -0,0 +1,11 @@
+type file {}
+
+(file t) echo (string s="hello world") { //s has a default value
+ app {
+ echo s stdout=@filename(t); //redirect stdout to a file
+ }
+}
+
+file hw1, hw2;
+hw1 = echo(); // procedure call using the default value
+hw2 = echo(s="hello again"); // using a different value
Deleted: branches/tests-01/tests/diamond.dtm
===================================================================
--- branches/tests-01/tests/diamond.dtm 2010-07-19 21:06:11 UTC (rev 3445)
+++ branches/tests-01/tests/diamond.dtm 2010-07-19 21:10:01 UTC (rev 3446)
@@ -1,33 +0,0 @@
-type file {};
-
-(file f) generate (float p1) {
- app {
- generate "-aTOP -T4" "-p" p1 "-o" @f;
- }
-}
-
-(file f2) process (file f1, string name, float p2) {
- app {
- process "-a" name "-T4" "-p" p2 "-i" @f1 "-o" @f2;
- }
-}
-
-(file f3) combine (file f1, file f2) {
- app {
- combine "-aBOTTOM -T4" "-i" @f1 @f2 "-o" @f3;
- }
-}
-
-(file fd) diamond (float p1, float p2) {
- file fa;
- file fb;
- file fc;
-
- fa = generate(p1);
- fb = process(fa, "LEFT", p2);
- fc = process(fa, "RIGHT", p2);
- fd = combine(fb, fc);
-}
-
-file final<"FINAL">;
-final = diamond(1, 100);
Copied: branches/tests-01/tests/diamond.swift (from rev 3445, branches/tests-01/tests/diamond.dtm)
===================================================================
--- branches/tests-01/tests/diamond.swift (rev 0)
+++ branches/tests-01/tests/diamond.swift 2010-07-19 21:10:01 UTC (rev 3446)
@@ -0,0 +1,33 @@
+type file {};
+
+(file f) generate (float p1) {
+ app {
+ generate "-aTOP -T4" "-p" p1 "-o" @f;
+ }
+}
+
+(file f2) process (file f1, string name, float p2) {
+ app {
+ process "-a" name "-T4" "-p" p2 "-i" @f1 "-o" @f2;
+ }
+}
+
+(file f3) combine (file f1, file f2) {
+ app {
+ combine "-aBOTTOM -T4" "-i" @f1 @f2 "-o" @f3;
+ }
+}
+
+(file fd) diamond (float p1, float p2) {
+ file fa;
+ file fb;
+ file fc;
+
+ fa = generate(p1);
+ fb = process(fa, "LEFT", p2);
+ fc = process(fa, "RIGHT", p2);
+ fd = combine(fb, fc);
+}
+
+file final<"FINAL">;
+final = diamond(1, 100);
Deleted: branches/tests-01/tests/file_counter.dtm
===================================================================
--- branches/tests-01/tests/file_counter.dtm 2010-07-19 21:06:11 UTC (rev 3445)
+++ branches/tests-01/tests/file_counter.dtm 2010-07-19 21:10:01 UTC (rev 3446)
@@ -1,20 +0,0 @@
-// a two-step workflow that essentially does
-// ls "*.txt" | wc
-
-type file {}
-
-(file f) ls (string s) {
- app {
- ls s stdout=@filename(f);
- }
-}
-
-(file c) wc (file f) {
- app {
- wc stdin=@filename(f) stdout=@filename(c);
- }
-}
-
-file list, count;
-list = ls("/");
-count = wc(list);
Copied: branches/tests-01/tests/file_counter.swift (from rev 3445, branches/tests-01/tests/file_counter.dtm)
===================================================================
--- branches/tests-01/tests/file_counter.swift (rev 0)
+++ branches/tests-01/tests/file_counter.swift 2010-07-19 21:10:01 UTC (rev 3446)
@@ -0,0 +1,20 @@
+// a two-step workflow that essentially does
+// ls "*.txt" | wc
+
+type file {}
+
+(file f) ls (string s) {
+ app {
+ ls s stdout=@filename(f);
+ }
+}
+
+(file c) wc (file f) {
+ app {
+ wc stdin=@filename(f) stdout=@filename(c);
+ }
+}
+
+file list, count;
+list = ls("/");
+count = wc(list);
Deleted: branches/tests-01/tests/hello.dtm
===================================================================
--- branches/tests-01/tests/hello.dtm 2010-07-19 21:06:11 UTC (rev 3445)
+++ branches/tests-01/tests/hello.dtm 2010-07-19 21:10:01 UTC (rev 3446)
@@ -1,12 +0,0 @@
-type file {}
-
-
-(file t) echo (string s) {
- app {
- echo s stdout=@filename(t);
- }
-}
-
-file hw = echo("hello world"); // May need syntax to give a call a name.
-
-
Copied: branches/tests-01/tests/hello.swift (from rev 3445, branches/tests-01/tests/hello.dtm)
===================================================================
--- branches/tests-01/tests/hello.swift (rev 0)
+++ branches/tests-01/tests/hello.swift 2010-07-19 21:10:01 UTC (rev 3446)
@@ -0,0 +1,12 @@
+type file {}
+
+
+(file t) echo (string s) {
+ app {
+ echo s stdout=@filename(t);
+ }
+}
+
+file hw = echo("hello world"); // May need syntax to give a call a name.
+
+
Deleted: branches/tests-01/tests/helloworld.dtm
===================================================================
--- branches/tests-01/tests/helloworld.dtm 2010-07-19 21:06:11 UTC (rev 3445)
+++ branches/tests-01/tests/helloworld.dtm 2010-07-19 21:10:01 UTC (rev 3446)
@@ -1,8 +0,0 @@
-type file {} //define a type for file
-(file t) echo (string s) { //procedure declaration
- app {
- echo s stdout=@filename(t); //redirect stdout to a file
- }
-}
-
-file hw = echo("hello world"); //procedure call
Copied: branches/tests-01/tests/helloworld.swift (from rev 3445, branches/tests-01/tests/helloworld.dtm)
===================================================================
--- branches/tests-01/tests/helloworld.swift (rev 0)
+++ branches/tests-01/tests/helloworld.swift 2010-07-19 21:10:01 UTC (rev 3446)
@@ -0,0 +1,8 @@
+type file {} //define a type for file
+(file t) echo (string s) { //procedure declaration
+ app {
+ echo s stdout=@filename(t); //redirect stdout to a file
+ }
+}
+
+file hw = echo("hello world"); //procedure call
Deleted: branches/tests-01/tests/helloworld_named.dtm
===================================================================
--- branches/tests-01/tests/helloworld_named.dtm 2010-07-19 21:06:11 UTC (rev 3445)
+++ branches/tests-01/tests/helloworld_named.dtm 2010-07-19 21:10:01 UTC (rev 3446)
@@ -1,9 +0,0 @@
-type file {} //define a type for file
-(file t) echo (string s) { //procedure declaration
- app {
- echo s stdout=@filename(t); //redirect stdout to a file
- }
-}
-
-file hw<"helloworld.txt">; //name the output file
-hw = echo("hello world"); //procedure call
Copied: branches/tests-01/tests/helloworld_named.swift (from rev 3445, branches/tests-01/tests/helloworld_named.dtm)
===================================================================
--- branches/tests-01/tests/helloworld_named.swift (rev 0)
+++ branches/tests-01/tests/helloworld_named.swift 2010-07-19 21:10:01 UTC (rev 3446)
@@ -0,0 +1,9 @@
+type file {} //define a type for file
+(file t) echo (string s) { //procedure declaration
+ app {
+ echo s stdout=@filename(t); //redirect stdout to a file
+ }
+}
+
+file hw<"helloworld.txt">; //name the output file
+hw = echo("hello world"); //procedure call
Deleted: branches/tests-01/tests/language/should-not-work/1151-bad-comment.dtm
===================================================================
--- branches/tests-01/tests/language/should-not-work/1151-bad-comment.dtm 2010-07-19 21:06:11 UTC (rev 3445)
+++ branches/tests-01/tests/language/should-not-work/1151-bad-comment.dtm 2010-07-19 21:10:01 UTC (rev 3446)
@@ -1 +0,0 @@
-/namedOutputs = waveletTransf(waveletScript, 101, "FB");
Copied: branches/tests-01/tests/language/should-not-work/1151-bad-comment.swift (from rev 3445, branches/tests-01/tests/language/should-not-work/1151-bad-comment.dtm)
===================================================================
--- branches/tests-01/tests/language/should-not-work/1151-bad-comment.swift (rev 0)
+++ branches/tests-01/tests/language/should-not-work/1151-bad-comment.swift 2010-07-19 21:10:01 UTC (rev 3446)
@@ -0,0 +1 @@
+/namedOutputs = waveletTransf(waveletScript, 101, "FB");
Deleted: branches/tests-01/tests/language/should-not-work/116-keyword-misuse-in.dtm
===================================================================
--- branches/tests-01/tests/language/should-not-work/116-keyword-misuse-in.dtm 2010-07-19 21:06:11 UTC (rev 3445)
+++ branches/tests-01/tests/language/should-not-work/116-keyword-misuse-in.dtm 2010-07-19 21:10:01 UTC (rev 3446)
@@ -1 +0,0 @@
-in a;
Copied: branches/tests-01/tests/language/should-not-work/116-keyword-misuse-in.swift (from rev 3445, branches/tests-01/tests/language/should-not-work/116-keyword-misuse-in.dtm)
===================================================================
--- branches/tests-01/tests/language/should-not-work/116-keyword-misuse-in.swift (rev 0)
+++ branches/tests-01/tests/language/should-not-work/116-keyword-misuse-in.swift 2010-07-19 21:10:01 UTC (rev 3446)
@@ -0,0 +1 @@
+in a;
Deleted: branches/tests-01/tests/language/should-not-work/117-empty-program.dtm
===================================================================
--- branches/tests-01/tests/language/should-not-work/117-empty-program.dtm 2010-07-19 21:06:11 UTC (rev 3445)
+++ branches/tests-01/tests/language/should-not-work/117-empty-program.dtm 2010-07-19 21:10:01 UTC (rev 3446)
@@ -1 +0,0 @@
-;
Copied: branches/tests-01/tests/language/should-not-work/117-empty-program.swift (from rev 3445, branches/tests-01/tests/language/should-not-work/117-empty-program.dtm)
===================================================================
--- branches/tests-01/tests/language/should-not-work/117-empty-program.swift (rev 0)
+++ branches/tests-01/tests/language/should-not-work/117-empty-program.swift 2010-07-19 21:10:01 UTC (rev 3446)
@@ -0,0 +1 @@
+;
Deleted: branches/tests-01/tests/language/should-not-work/case-broken2.dtm
===================================================================
--- branches/tests-01/tests/language/should-not-work/case-broken2.dtm 2010-07-19 21:06:11 UTC (rev 3445)
+++ branches/tests-01/tests/language/should-not-work/case-broken2.dtm 2010-07-19 21:10:01 UTC (rev 3446)
@@ -1,14 +0,0 @@
-
-switch(d)
-{
- case 1:
- f(g);
- break;
- case 5:
- j=7;
- uuu=fn(t+7+e+3*2);
- break;
- default:
- s="the default";
-}}
-
Copied: branches/tests-01/tests/language/should-not-work/case-broken2.swift (from rev 3445, branches/tests-01/tests/language/should-not-work/case-broken2.dtm)
===================================================================
--- branches/tests-01/tests/language/should-not-work/case-broken2.swift (rev 0)
+++ branches/tests-01/tests/language/should-not-work/case-broken2.swift 2010-07-19 21:10:01 UTC (rev 3446)
@@ -0,0 +1,14 @@
+
+switch(d)
+{
+ case 1:
+ f(g);
+ break;
+ case 5:
+ j=7;
+ uuu=fn(t+7+e+3*2);
+ break;
+ default:
+ s="the default";
+}}
+
Deleted: branches/tests-01/tests/language/should-not-work/closes.dtm
===================================================================
--- branches/tests-01/tests/language/should-not-work/closes.dtm 2010-07-19 21:06:11 UTC (rev 3445)
+++ branches/tests-01/tests/language/should-not-work/closes.dtm 2010-07-19 21:10:01 UTC (rev 3446)
@@ -1,2 +0,0 @@
-}}}}
-
Copied: branches/tests-01/tests/language/should-not-work/closes.swift (from rev 3445, branches/tests-01/tests/language/should-not-work/closes.dtm)
===================================================================
--- branches/tests-01/tests/language/should-not-work/closes.swift (rev 0)
+++ branches/tests-01/tests/language/should-not-work/closes.swift 2010-07-19 21:10:01 UTC (rev 3446)
@@ -0,0 +1,2 @@
+}}}}
+
Modified: branches/tests-01/tests/nightly.sh
===================================================================
--- branches/tests-01/tests/nightly.sh 2010-07-19 21:06:11 UTC (rev 3445)
+++ branches/tests-01/tests/nightly.sh 2010-07-19 21:10:01 UTC (rev 3446)
@@ -9,28 +9,34 @@
RUNDIR=$OUTDIR/$RUNDIRBASE
mkdir -p $RUNDIR
-if [ "$1" == "-fco" ]; then
- FCO=1
- shift
-elif [ "$2" == "-fco" ]; then
- FCO=1
-fi
+OUTBASE=$RUNDIRBASE/tests.log
-if [ "$1" == "" ]; then
- OUTBASE=$RUNDIRBASE/tests.log
-else
- OUTBASE=$RUNDIRBASE/$1
-fi
+BRANCH="branches/tests-01"
+
+while [ $# -gt 0 ]; do
+ case $1 in
+ -s)
+ SKIP_CHECKOUT=1
+ shift;;
+ -x)
+ EXIT_ON_ERROR=1
+ shift;;
+ *)
+ OUTBASE=$RUNDIRBASE/$1
+ shift;;
+ esac
+done
+
OUT=$OUTDIR/$OUTBASE
-head() {
+header() {
HTMLBASE=tests-$DATE.html
HTML=$OUTDIR/$HTMLBASE
rm -f $OUTDIR/current.html
-
+
#This doesn't work well with servers that don't follow symlinks
#ln -s $HTML $OUTDIR/current.html
-
+
cat <<DOH >$OUTDIR/current.html
<html>
<head>
@@ -81,10 +87,10 @@
echo $@ >>$HTML
}
-tail() {
+footer() {
MONTHS=("" "Jan" "Feb" "Mar" "Apr" "May" "Jun" "Jul" "Aug" "Sep" "Oct" "Nov" "Dec")
html "</tr></table></tr></table>"
-
+
if [ "$BINPACKAGE" != "" ]; then
FBP=$OUTDIR/$BINPACKAGE
SIZE=`ls -hs $FBP`
@@ -95,7 +101,7 @@
<a href="$BINPACKAGE">$BINPACKAGE</a> ($SIZE)<br>
DOH
fi
-
+
LASTYR="00"
LASTMO="00"
html "<h1>Older tests</h1>"
@@ -153,13 +159,13 @@
echo $@
TYPE=$1
if [ "$TYPE" == "test" ]; then
-
+
NAME=$2
SEQ=$3
CMD=$4
RES=$5
LOG=$6
-
+
if [ "$FIRSTTEST" == "1" ]; then
html "<h1>Test results</h1>"
html "<a name=\"tests\">"
@@ -171,12 +177,12 @@
html "</tr></table></tr>"
fi
fi
-
+
if [ "$TESTPART" != "" ]; then
html "<tr class=\"part\"><th colspan=\"2\">$TESTPART</th></tr>"
TESTPART=
fi
-
+
if [ "$FLUSH" == "1" ]; then
html "<tr class=\"testline\"><th align=\"right\">$NAME: </th><td><table border=\"0\"><tr>"
fi
@@ -193,13 +199,12 @@
html "<a href=\"$LOG\">$SEQ</a>"
fi
html "</td>"
-
+
elif [ "$TYPE" == "package" ]; then
BINPACKAGE=$2
else
html $@
fi
-
}
aexec() {
@@ -214,7 +219,6 @@
if [ -f $OUTDIR/x73010test.log ]; then
cat $OUTDIR/x73010test.log >>$OUT
fi
-
}
tlog() {
@@ -321,38 +325,36 @@
head
TESTPART="Part I: Build"
EXITONFAILURE=true
-if [ "$FCO" != "1" ]; then
+if [ "$SKIP_CHECKOUT" != "1" ]; then
TEST="Checkout CoG"
pexec rm -rf cog
- vexec svn co https://cogkit.svn.sourceforge.net/svnroot/cogkit/trunk/current/src/cog
+ COG="https://cogkit.svn.sourceforge.net/svnroot/cogkit/trunk/current/src/cog"
+ vexec svn co $COG
TEST="Checkout Swift"
- pexec rm -rf trunk
- #vexec cvs -d :pserver:anonymous at cvs.cogkit.org:/cvs/cogkit co src/vdsk
- vexec svn co https://svn.ci.uchicago.edu/svn/vdl2/trunk
+ pexec cd cog/modules
+ pexec rm -rf swift
+ vexec svn co https://svn.ci.uchicago.edu/svn/vdl2/$BRANCH swift
+ pexec cd $OUTDIR
fi
-TEST="Directory setup"
-pexec mkdir cog/modules/vdsk
-vexec cp -r trunk/* cog/modules/vdsk
-
TEST="Compile"
-pexec cd cog/modules/vdsk
+pexec cd cog/modules/swift
pexec rm -rf dist
vexec ant -quiet dist
TEST="Package"
pexec cd dist
-VDSK=`ls -d vdsk*.*`
-pexec cd $VDSK/lib
+SWIFT=$( ls -d swift-* )
+pexec cd $SWIFT/lib
pexec rm -f castor*.jar *gt2ft*.jar ant.jar
pexec cd ../..
-pexec rm -rf vdsk-$DATE
-pexec mv $VDSK vdsk-$DATE
-vexec tar -pczf $OUTDIR/vdsk-$DATE.tar.gz vdsk-$DATE
-out package "vdsk-$DATE.tar.gz"
+pexec rm -rf swift-$DATE
+pexec mv $SWIFT swift-$DATE
+vexec tar -pczf $OUTDIR/swift-$DATE.tar.gz swift-$DATE
+out package "swift-$DATE.tar.gz"
-PATH=$PWD/vdsk-$DATE/bin:$PATH
+PATH=$PWD/swift-$DATE/bin:$PATH
cd ..
TESTDIR=$PWD/tests
echo "Path: $PATH" >>$OUT
@@ -361,21 +363,18 @@
EXITONFAILURE=false
TESTPART="Part II: Local Tests"
-for TEST in `ls $TESTDIR/*.dtm $TESTDIR/*.swift`; do
- BN=`basename $TEST`
- echo $BN
- cp $TESTDIR/$BN .
-
-
- TESTNAME=${BN%.dtm}
- TESTNAME=${TESTNAME%.swift}
- TEST="<a href=\"$RUNDIRBASE/$BN\">$TESTNAME</a>"
-
- ssexec "Compile" vdlc $BN
- for ((i=0; $i<9; i=$i+1)); do
- pexec swift -sites.file ~/.vdl2/sites-local.xml $TESTNAME.kml
- done
- vexec swift -sites.file ~/.vdl2/sites-local.xml $TESTNAME.kml
+for TEST in $( ls $TESTDIR/*.swift ); do # $TESTDIR/*.dtm
+ TESTNAME=$( basename $TEST)
+ echo TESTNAME: $TESTNAME
+ cp -uv $TESTDIR/$TESTNAME .
+
+ TEST="<a href=\"$RUNDIRBASE/$TESTNAME\">$TESTNAME</a>"
+
+ # ssexec "Compile" vdlc $BN
+ for ((i=0; $i<9; i=$i+1)); do
+ pexec swift -sites.file ~/.vdl2/sites-local.xml $TESTNAME
+ done
+ vexec swift -sites.file ~/.vdl2/sites-local.xml $TESTNAME
done
TESTPART="Part III: Grid Tests"
@@ -384,11 +383,11 @@
BN=`basename $TEST`
echo $BN
cp $TESTDIR/$BN .
-
+
TESTNAME=${BN%.dtm}
TESTNAME=${TESTNAME%.swift}
TEST="<a href=\"$RUNDIRBASE/$BN\">$TESTNAME</a>"
-
+
ssexec "Compile" vdlc $BN
for ((i=0; $i<9; i=$i+1)); do
pexec swift -sites.file ~/.vdl2/sites-grid.xml $TESTNAME.kml
@@ -397,4 +396,4 @@
done
#Don't remove me:
-tail
+footer
Deleted: branches/tests-01/tests/range.dtm
===================================================================
--- branches/tests-01/tests/range.dtm 2010-07-19 21:06:11 UTC (rev 3445)
+++ branches/tests-01/tests/range.dtm 2010-07-19 21:10:01 UTC (rev 3446)
@@ -1,5 +0,0 @@
-int nums[] = [0:20:2]; // generate a list 0, 2, 4, 6, 8 ...
-
-foreach num in nums {
- print(num);
-}
Copied: branches/tests-01/tests/range.swift (from rev 3445, branches/tests-01/tests/range.dtm)
===================================================================
--- branches/tests-01/tests/range.swift (rev 0)
+++ branches/tests-01/tests/range.swift 2010-07-19 21:10:01 UTC (rev 3446)
@@ -0,0 +1,5 @@
+int nums[] = [0:20:2]; // generate a list 0, 2, 4, 6, 8 ...
+
+foreach num in nums {
+ print(num);
+}
More information about the Swift-commit
mailing list