[Swift-commit] r4947 - in branches/release-0.93/tests: . bugs groups language/working language-behaviour/mappers providers/local-pbs/fusion providers/local-pbs-coasters providers/local-pbs-coasters/fusion providers/local-pbs-coasters/pads
hategan at ci.uchicago.edu
hategan at ci.uchicago.edu
Fri Aug 5 00:14:57 CDT 2011
Author: hategan
Date: 2011-08-05 00:14:57 -0500 (Fri, 05 Aug 2011)
New Revision: 4947
Added:
branches/release-0.93/tests/bugs/
branches/release-0.93/tests/bugs/481-array-hang.swift
branches/release-0.93/tests/language/working/015-mapper-literal.in
branches/release-0.93/tests/providers/local-pbs-coasters/fusion/001-catsn.check.sh
branches/release-0.93/tests/providers/local-pbs-coasters/fusion/001-catsn.setup.sh
branches/release-0.93/tests/providers/local-pbs-coasters/fusion/001-catsn.swift
branches/release-0.93/tests/providers/local-pbs-coasters/fusion/001-catsn.timeout
branches/release-0.93/tests/providers/local-pbs-coasters/fusion/data.txt
branches/release-0.93/tests/providers/local-pbs-coasters/fusion/sites.template.xml
branches/release-0.93/tests/providers/local-pbs-coasters/fusion/tc.template.data
branches/release-0.93/tests/providers/local-pbs-coasters/pads/
branches/release-0.93/tests/providers/local-pbs-coasters/pads/001-catsn.check.sh
branches/release-0.93/tests/providers/local-pbs-coasters/pads/001-catsn.setup.sh
branches/release-0.93/tests/providers/local-pbs-coasters/pads/001-catsn.swift
branches/release-0.93/tests/providers/local-pbs-coasters/pads/001-catsn.timeout
branches/release-0.93/tests/providers/local-pbs-coasters/pads/data.txt
branches/release-0.93/tests/providers/local-pbs-coasters/pads/sites.template.xml
branches/release-0.93/tests/providers/local-pbs-coasters/pads/tc.template.data
Removed:
branches/release-0.93/tests/bugs/481-array-hang.swift
branches/release-0.93/tests/providers/local-pbs-coasters/001-catsn-pads-local-pbs-coasters.check.sh
branches/release-0.93/tests/providers/local-pbs-coasters/001-catsn-pads-local-pbs-coasters.setup.sh
branches/release-0.93/tests/providers/local-pbs-coasters/001-catsn-pads-local-pbs-coasters.swift
branches/release-0.93/tests/providers/local-pbs-coasters/001-catsn-pads-local-pbs-coasters.timeout
branches/release-0.93/tests/providers/local-pbs-coasters/catsn.0001.out.expected
branches/release-0.93/tests/providers/local-pbs-coasters/catsn.0002.out.expected
branches/release-0.93/tests/providers/local-pbs-coasters/catsn.0003.out.expected
branches/release-0.93/tests/providers/local-pbs-coasters/catsn.0004.out.expected
branches/release-0.93/tests/providers/local-pbs-coasters/catsn.0005.out.expected
branches/release-0.93/tests/providers/local-pbs-coasters/catsn.0006.out.expected
branches/release-0.93/tests/providers/local-pbs-coasters/catsn.0007.out.expected
branches/release-0.93/tests/providers/local-pbs-coasters/catsn.0008.out.expected
branches/release-0.93/tests/providers/local-pbs-coasters/catsn.0009.out.expected
branches/release-0.93/tests/providers/local-pbs-coasters/catsn.0010.out.expected
branches/release-0.93/tests/providers/local-pbs-coasters/data.txt
branches/release-0.93/tests/providers/local-pbs-coasters/pads/001-catsn.check.sh
branches/release-0.93/tests/providers/local-pbs-coasters/pads/001-catsn.setup.sh
branches/release-0.93/tests/providers/local-pbs-coasters/pads/001-catsn.swift
branches/release-0.93/tests/providers/local-pbs-coasters/pads/001-catsn.timeout
branches/release-0.93/tests/providers/local-pbs-coasters/pads/data.txt
branches/release-0.93/tests/providers/local-pbs-coasters/pads/sites.template.xml
branches/release-0.93/tests/providers/local-pbs-coasters/pads/tc.template.data
branches/release-0.93/tests/providers/local-pbs-coasters/sites.template.xml
branches/release-0.93/tests/providers/local-pbs-coasters/tc.template.data
Modified:
branches/release-0.93/tests/
branches/release-0.93/tests/groups/group-all-local.sh
branches/release-0.93/tests/language-behaviour/mappers/07511-fixed-array-mapper-input.check.sh
branches/release-0.93/tests/language/working/015-mapper-literal.swift
branches/release-0.93/tests/providers/local-pbs/fusion/001-catsn.check.sh
branches/release-0.93/tests/providers/local-pbs/fusion/001-catsn.setup.sh
branches/release-0.93/tests/suite.sh
Log:
backported test fixes from trunk
Property changes on: branches/release-0.93/tests
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk/tests:4762-4946
Deleted: branches/release-0.93/tests/bugs/481-array-hang.swift
===================================================================
--- trunk/tests/bugs/481-array-hang.swift 2011-08-05 00:18:28 UTC (rev 4946)
+++ branches/release-0.93/tests/bugs/481-array-hang.swift 2011-08-05 05:14:57 UTC (rev 4947)
@@ -1,4 +0,0 @@
-int[] a = [1, 2, 3];
-
-// hangs waiting for a[4]
-trace(a[4]);
\ No newline at end of file
Copied: branches/release-0.93/tests/bugs/481-array-hang.swift (from rev 4946, trunk/tests/bugs/481-array-hang.swift)
===================================================================
--- branches/release-0.93/tests/bugs/481-array-hang.swift (rev 0)
+++ branches/release-0.93/tests/bugs/481-array-hang.swift 2011-08-05 05:14:57 UTC (rev 4947)
@@ -0,0 +1,4 @@
+int[] a = [1, 2, 3];
+
+// hangs waiting for a[4]
+trace(a[4]);
\ No newline at end of file
Modified: branches/release-0.93/tests/groups/group-all-local.sh
===================================================================
--- branches/release-0.93/tests/groups/group-all-local.sh 2011-08-05 00:18:28 UTC (rev 4946)
+++ branches/release-0.93/tests/groups/group-all-local.sh 2011-08-05 05:14:57 UTC (rev 4947)
@@ -20,6 +20,7 @@
$TESTDIR/language-behaviour/procedures \
$TESTDIR/language-behaviour/strings \
$TESTDIR/language-behaviour/variables \
+ $TESTDIR/bugs \
$TESTDIR/documentation/tutorial \
# $TESTDIR/cdm/ps/pinned
# $TESTDIR/site/intrepid
Copied: branches/release-0.93/tests/language/working/015-mapper-literal.in (from rev 4946, trunk/tests/language/working/015-mapper-literal.in)
===================================================================
Modified: branches/release-0.93/tests/language/working/015-mapper-literal.swift
===================================================================
--- branches/release-0.93/tests/language/working/015-mapper-literal.swift 2011-08-05 00:18:28 UTC (rev 4946)
+++ branches/release-0.93/tests/language/working/015-mapper-literal.swift 2011-08-05 05:14:57 UTC (rev 4947)
@@ -1,2 +1,2 @@
type myfile;
-myfile v<"literalfilename.txt">;
+myfile v<"015-mapper-literal.in">;
Modified: branches/release-0.93/tests/language-behaviour/mappers/07511-fixed-array-mapper-input.check.sh
===================================================================
--- branches/release-0.93/tests/language-behaviour/mappers/07511-fixed-array-mapper-input.check.sh 2011-08-05 00:18:28 UTC (rev 4946)
+++ branches/release-0.93/tests/language-behaviour/mappers/07511-fixed-array-mapper-input.check.sh 2011-08-05 05:14:57 UTC (rev 4947)
@@ -1,6 +1,6 @@
#!/bin/bash
set -x
-cat $OUTPUT | grep "file: 07511-fixed-array-mapper-input.first.in" || exit 1
-cat $OUTPUT | grep "file: 07511-fixed-array-mapper-input.second.in" || exit 1
-cat $OUTPUT | grep "file: 07511-fixed-array-mapper-input.third.in" || exit 1
+cat $TEST_LOG | grep "file: 07511-fixed-array-mapper-input.first.in" || exit 1
+cat $TEST_LOG | grep "file: 07511-fixed-array-mapper-input.second.in" || exit 1
+cat $TEST_LOG | grep "file: 07511-fixed-array-mapper-input.third.in" || exit 1
exit 0
Modified: branches/release-0.93/tests/providers/local-pbs/fusion/001-catsn.check.sh
===================================================================
--- branches/release-0.93/tests/providers/local-pbs/fusion/001-catsn.check.sh 2011-08-05 00:18:28 UTC (rev 4946)
+++ branches/release-0.93/tests/providers/local-pbs/fusion/001-catsn.check.sh 2011-08-05 05:14:57 UTC (rev 4947)
@@ -1,9 +1,9 @@
#!/bin/bash
-# Pseudo-code for now
+set -x
-# for f in *.out.expected
-# do
-# assert *.out exists
-# assert *.out.expected == *.out
-# done
+LINES=$( ls catsn*.out | wc -l )
+[[ ${?} == 0 ]] || exit 1
+[[ ${LINES} == 10 ]] || exit 1
+
+exit 0
Modified: branches/release-0.93/tests/providers/local-pbs/fusion/001-catsn.setup.sh
===================================================================
--- branches/release-0.93/tests/providers/local-pbs/fusion/001-catsn.setup.sh 2011-08-05 00:18:28 UTC (rev 4946)
+++ branches/release-0.93/tests/providers/local-pbs/fusion/001-catsn.setup.sh 2011-08-05 05:14:57 UTC (rev 4947)
@@ -1,4 +1,4 @@
#!/bin/bash
cp -v $GROUP/data.txt . || exit 1
-cp -v $GROUP/*expected . || exit 1
+
Deleted: branches/release-0.93/tests/providers/local-pbs-coasters/001-catsn-pads-local-pbs-coasters.check.sh
===================================================================
--- branches/release-0.93/tests/providers/local-pbs-coasters/001-catsn-pads-local-pbs-coasters.check.sh 2011-08-05 00:18:28 UTC (rev 4946)
+++ branches/release-0.93/tests/providers/local-pbs-coasters/001-catsn-pads-local-pbs-coasters.check.sh 2011-08-05 05:14:57 UTC (rev 4947)
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-set -x
-
-for count in `seq --format "%04.f" 1 1 10`
-do
- [ -f catsn.$count.out ] || exit 1
- CONTENTS1=$( cat catsn.$count.out.expected )
- CONTENTS2=$( cat catsn.$count.out )
- [[ $CONTENTS1 == $CONTENTS2 ]] || exit 1
-done
-exit 0
Deleted: branches/release-0.93/tests/providers/local-pbs-coasters/001-catsn-pads-local-pbs-coasters.setup.sh
===================================================================
--- branches/release-0.93/tests/providers/local-pbs-coasters/001-catsn-pads-local-pbs-coasters.setup.sh 2011-08-05 00:18:28 UTC (rev 4946)
+++ branches/release-0.93/tests/providers/local-pbs-coasters/001-catsn-pads-local-pbs-coasters.setup.sh 2011-08-05 05:14:57 UTC (rev 4947)
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-cp -v $GROUP/data.txt . || exit 1
-cp -v $GROUP/*expected . || exit 1
Deleted: branches/release-0.93/tests/providers/local-pbs-coasters/001-catsn-pads-local-pbs-coasters.swift
===================================================================
--- branches/release-0.93/tests/providers/local-pbs-coasters/001-catsn-pads-local-pbs-coasters.swift 2011-08-05 00:18:28 UTC (rev 4946)
+++ branches/release-0.93/tests/providers/local-pbs-coasters/001-catsn-pads-local-pbs-coasters.swift 2011-08-05 05:14:57 UTC (rev 4947)
@@ -1,15 +0,0 @@
-type file;
-
-app (file o) cat (file i)
-{
- cat @i stdout=@o;
-}
-
-string t = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-string char[] = @strsplit(t, "");
-
-file out[]<simple_mapper; location=".", prefix="catsn.",suffix=".out">;
-foreach j in [1:@toint(@arg("n","10"))] {
- file data<"data.txt">;
- out[j] = cat(data);
-}
Deleted: branches/release-0.93/tests/providers/local-pbs-coasters/001-catsn-pads-local-pbs-coasters.timeout
===================================================================
--- branches/release-0.93/tests/providers/local-pbs-coasters/001-catsn-pads-local-pbs-coasters.timeout 2011-08-05 00:18:28 UTC (rev 4946)
+++ branches/release-0.93/tests/providers/local-pbs-coasters/001-catsn-pads-local-pbs-coasters.timeout 2011-08-05 05:14:57 UTC (rev 4947)
@@ -1,2 +0,0 @@
-7200
-
Deleted: branches/release-0.93/tests/providers/local-pbs-coasters/catsn.0001.out.expected
===================================================================
--- branches/release-0.93/tests/providers/local-pbs-coasters/catsn.0001.out.expected 2011-08-05 00:18:28 UTC (rev 4946)
+++ branches/release-0.93/tests/providers/local-pbs-coasters/catsn.0001.out.expected 2011-08-05 05:14:57 UTC (rev 4947)
@@ -1 +0,0 @@
-Hello world
Deleted: branches/release-0.93/tests/providers/local-pbs-coasters/catsn.0002.out.expected
===================================================================
--- branches/release-0.93/tests/providers/local-pbs-coasters/catsn.0002.out.expected 2011-08-05 00:18:28 UTC (rev 4946)
+++ branches/release-0.93/tests/providers/local-pbs-coasters/catsn.0002.out.expected 2011-08-05 05:14:57 UTC (rev 4947)
@@ -1 +0,0 @@
-Hello world
Deleted: branches/release-0.93/tests/providers/local-pbs-coasters/catsn.0003.out.expected
===================================================================
--- branches/release-0.93/tests/providers/local-pbs-coasters/catsn.0003.out.expected 2011-08-05 00:18:28 UTC (rev 4946)
+++ branches/release-0.93/tests/providers/local-pbs-coasters/catsn.0003.out.expected 2011-08-05 05:14:57 UTC (rev 4947)
@@ -1 +0,0 @@
-Hello world
Deleted: branches/release-0.93/tests/providers/local-pbs-coasters/catsn.0004.out.expected
===================================================================
--- branches/release-0.93/tests/providers/local-pbs-coasters/catsn.0004.out.expected 2011-08-05 00:18:28 UTC (rev 4946)
+++ branches/release-0.93/tests/providers/local-pbs-coasters/catsn.0004.out.expected 2011-08-05 05:14:57 UTC (rev 4947)
@@ -1 +0,0 @@
-Hello world
Deleted: branches/release-0.93/tests/providers/local-pbs-coasters/catsn.0005.out.expected
===================================================================
--- branches/release-0.93/tests/providers/local-pbs-coasters/catsn.0005.out.expected 2011-08-05 00:18:28 UTC (rev 4946)
+++ branches/release-0.93/tests/providers/local-pbs-coasters/catsn.0005.out.expected 2011-08-05 05:14:57 UTC (rev 4947)
@@ -1 +0,0 @@
-Hello world
Deleted: branches/release-0.93/tests/providers/local-pbs-coasters/catsn.0006.out.expected
===================================================================
--- branches/release-0.93/tests/providers/local-pbs-coasters/catsn.0006.out.expected 2011-08-05 00:18:28 UTC (rev 4946)
+++ branches/release-0.93/tests/providers/local-pbs-coasters/catsn.0006.out.expected 2011-08-05 05:14:57 UTC (rev 4947)
@@ -1 +0,0 @@
-Hello world
Deleted: branches/release-0.93/tests/providers/local-pbs-coasters/catsn.0007.out.expected
===================================================================
--- branches/release-0.93/tests/providers/local-pbs-coasters/catsn.0007.out.expected 2011-08-05 00:18:28 UTC (rev 4946)
+++ branches/release-0.93/tests/providers/local-pbs-coasters/catsn.0007.out.expected 2011-08-05 05:14:57 UTC (rev 4947)
@@ -1 +0,0 @@
-Hello world
Deleted: branches/release-0.93/tests/providers/local-pbs-coasters/catsn.0008.out.expected
===================================================================
--- branches/release-0.93/tests/providers/local-pbs-coasters/catsn.0008.out.expected 2011-08-05 00:18:28 UTC (rev 4946)
+++ branches/release-0.93/tests/providers/local-pbs-coasters/catsn.0008.out.expected 2011-08-05 05:14:57 UTC (rev 4947)
@@ -1 +0,0 @@
-Hello world
Deleted: branches/release-0.93/tests/providers/local-pbs-coasters/catsn.0009.out.expected
===================================================================
--- branches/release-0.93/tests/providers/local-pbs-coasters/catsn.0009.out.expected 2011-08-05 00:18:28 UTC (rev 4946)
+++ branches/release-0.93/tests/providers/local-pbs-coasters/catsn.0009.out.expected 2011-08-05 05:14:57 UTC (rev 4947)
@@ -1 +0,0 @@
-Hello world
Deleted: branches/release-0.93/tests/providers/local-pbs-coasters/catsn.0010.out.expected
===================================================================
--- branches/release-0.93/tests/providers/local-pbs-coasters/catsn.0010.out.expected 2011-08-05 00:18:28 UTC (rev 4946)
+++ branches/release-0.93/tests/providers/local-pbs-coasters/catsn.0010.out.expected 2011-08-05 05:14:57 UTC (rev 4947)
@@ -1 +0,0 @@
-Hello world
Deleted: branches/release-0.93/tests/providers/local-pbs-coasters/data.txt
===================================================================
--- branches/release-0.93/tests/providers/local-pbs-coasters/data.txt 2011-08-05 00:18:28 UTC (rev 4946)
+++ branches/release-0.93/tests/providers/local-pbs-coasters/data.txt 2011-08-05 05:14:57 UTC (rev 4947)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93/tests/providers/local-pbs-coasters/fusion/001-catsn.check.sh (from rev 4946, trunk/tests/providers/local-pbs-coasters/fusion/001-catsn.check.sh)
===================================================================
--- branches/release-0.93/tests/providers/local-pbs-coasters/fusion/001-catsn.check.sh (rev 0)
+++ branches/release-0.93/tests/providers/local-pbs-coasters/fusion/001-catsn.check.sh 2011-08-05 05:14:57 UTC (rev 4947)
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -x
+
+for count in `seq --format "%04.f" 1 1 10`
+do
+ [ -f catsn.$count.out ] || exit 1
+ CONTENTS1=$( cat catsn.$count.out.expected )
+ CONTENTS2=$( cat catsn.$count.out )
+ [[ $CONTENTS1 == $CONTENTS2 ]] || exit 1
+done
+exit 0
Copied: branches/release-0.93/tests/providers/local-pbs-coasters/fusion/001-catsn.setup.sh (from rev 4946, trunk/tests/providers/local-pbs-coasters/fusion/001-catsn.setup.sh)
===================================================================
--- branches/release-0.93/tests/providers/local-pbs-coasters/fusion/001-catsn.setup.sh (rev 0)
+++ branches/release-0.93/tests/providers/local-pbs-coasters/fusion/001-catsn.setup.sh 2011-08-05 05:14:57 UTC (rev 4947)
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cp -v $GROUP/data.txt . || exit 1
+cp -v $GROUP/*expected . || exit 1
Copied: branches/release-0.93/tests/providers/local-pbs-coasters/fusion/001-catsn.swift (from rev 4946, trunk/tests/providers/local-pbs-coasters/fusion/001-catsn.swift)
===================================================================
--- branches/release-0.93/tests/providers/local-pbs-coasters/fusion/001-catsn.swift (rev 0)
+++ branches/release-0.93/tests/providers/local-pbs-coasters/fusion/001-catsn.swift 2011-08-05 05:14:57 UTC (rev 4947)
@@ -0,0 +1,15 @@
+type file;
+
+app (file o) cat (file i)
+{
+ cat @i stdout=@o;
+}
+
+string t = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+string char[] = @strsplit(t, "");
+
+file out[]<simple_mapper; location=".", prefix="catsn.",suffix=".out">;
+foreach j in [1:@toint(@arg("n","10"))] {
+ file data<"data.txt">;
+ out[j] = cat(data);
+}
Copied: branches/release-0.93/tests/providers/local-pbs-coasters/fusion/001-catsn.timeout (from rev 4946, trunk/tests/providers/local-pbs-coasters/fusion/001-catsn.timeout)
===================================================================
--- branches/release-0.93/tests/providers/local-pbs-coasters/fusion/001-catsn.timeout (rev 0)
+++ branches/release-0.93/tests/providers/local-pbs-coasters/fusion/001-catsn.timeout 2011-08-05 05:14:57 UTC (rev 4947)
@@ -0,0 +1,2 @@
+7200
+
Copied: branches/release-0.93/tests/providers/local-pbs-coasters/fusion/data.txt (from rev 4946, trunk/tests/providers/local-pbs-coasters/fusion/data.txt)
===================================================================
--- branches/release-0.93/tests/providers/local-pbs-coasters/fusion/data.txt (rev 0)
+++ branches/release-0.93/tests/providers/local-pbs-coasters/fusion/data.txt 2011-08-05 05:14:57 UTC (rev 4947)
@@ -0,0 +1 @@
+Hello world
Copied: branches/release-0.93/tests/providers/local-pbs-coasters/fusion/sites.template.xml (from rev 4946, trunk/tests/providers/local-pbs-coasters/fusion/sites.template.xml)
===================================================================
--- branches/release-0.93/tests/providers/local-pbs-coasters/fusion/sites.template.xml (rev 0)
+++ branches/release-0.93/tests/providers/local-pbs-coasters/fusion/sites.template.xml 2011-08-05 05:14:57 UTC (rev 4947)
@@ -0,0 +1,17 @@
+<config>
+<pool handle="local-pbs-coasters">
+ <execution jobmanager="local:pbs" provider="coaster" url="none"/>
+ <filesystem provider="local" url="none" />
+ <profile namespace="globus" key="maxWallTime">1</profile>
+ <profile namespace="globus" key="maxTime">7200</profile>
+ <profile key="jobsPerNode" namespace="globus">1</profile>
+ <profile key="slots" namespace="globus">1</profile>
+ <profile key="nodeGranularity" namespace="globus">1</profile>
+ <profile key="maxNodes" namespace="globus">1</profile>
+ <profile key="queue" namespace="globus">_QUEUE_</profile>
+ <profile key="jobThrottle" namespace="karajan">5.99</profile>
+ <profile key="initialScore" namespace="karajan">10000</profile>
+ <profile namespace="globus" key="project">_PROJECT_</profile>
+ <workdirectory>_WORK_</workdirectory>
+</pool>
+</config>
Copied: branches/release-0.93/tests/providers/local-pbs-coasters/fusion/tc.template.data (from rev 4946, trunk/tests/providers/local-pbs-coasters/fusion/tc.template.data)
===================================================================
--- branches/release-0.93/tests/providers/local-pbs-coasters/fusion/tc.template.data (rev 0)
+++ branches/release-0.93/tests/providers/local-pbs-coasters/fusion/tc.template.data 2011-08-05 05:14:57 UTC (rev 4947)
@@ -0,0 +1,8 @@
+local-pbs-coasters echo /bin/echo INSTALLED INTEL32::LINUX null
+local-pbs-coasters cat /bin/cat INSTALLED INTEL32::LINUX null
+local-pbs-coasters ls /bin/ls INSTALLED INTEL32::LINUX null
+local-pbs-coasters grep /bin/grep INSTALLED INTEL32::LINUX null
+local-pbs-coasters sort /bin/sort INSTALLED INTEL32::LINUX null
+local-pbs-coasters paste /bin/paste INSTALLED INTEL32::LINUX null
+local-pbs-coasters wc /usr/bin/wc INSTALLED INTEL32::LINUX null
+
Deleted: branches/release-0.93/tests/providers/local-pbs-coasters/pads/001-catsn.check.sh
===================================================================
--- trunk/tests/providers/local-pbs-coasters/pads/001-catsn.check.sh 2011-08-05 00:18:28 UTC (rev 4946)
+++ branches/release-0.93/tests/providers/local-pbs-coasters/pads/001-catsn.check.sh 2011-08-05 05:14:57 UTC (rev 4947)
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-set -x
-
-for count in `seq --format "%04.f" 1 1 10`
-do
- [ -f catsn.$count.out ] || exit 1
- CONTENTS1=$( cat catsn.$count.out.expected )
- CONTENTS2=$( cat catsn.$count.out )
- [[ $CONTENTS1 == $CONTENTS2 ]] || exit 1
-done
-exit 0
Copied: branches/release-0.93/tests/providers/local-pbs-coasters/pads/001-catsn.check.sh (from rev 4946, trunk/tests/providers/local-pbs-coasters/pads/001-catsn.check.sh)
===================================================================
--- branches/release-0.93/tests/providers/local-pbs-coasters/pads/001-catsn.check.sh (rev 0)
+++ branches/release-0.93/tests/providers/local-pbs-coasters/pads/001-catsn.check.sh 2011-08-05 05:14:57 UTC (rev 4947)
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -x
+
+for count in `seq --format "%04.f" 1 1 10`
+do
+ [ -f catsn.$count.out ] || exit 1
+ CONTENTS1=$( cat catsn.$count.out.expected )
+ CONTENTS2=$( cat catsn.$count.out )
+ [[ $CONTENTS1 == $CONTENTS2 ]] || exit 1
+done
+exit 0
Deleted: branches/release-0.93/tests/providers/local-pbs-coasters/pads/001-catsn.setup.sh
===================================================================
--- trunk/tests/providers/local-pbs-coasters/pads/001-catsn.setup.sh 2011-08-05 00:18:28 UTC (rev 4946)
+++ branches/release-0.93/tests/providers/local-pbs-coasters/pads/001-catsn.setup.sh 2011-08-05 05:14:57 UTC (rev 4947)
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-cp -v $GROUP/data.txt . || exit 1
-cp -v $GROUP/*expected . || exit 1
Copied: branches/release-0.93/tests/providers/local-pbs-coasters/pads/001-catsn.setup.sh (from rev 4946, trunk/tests/providers/local-pbs-coasters/pads/001-catsn.setup.sh)
===================================================================
--- branches/release-0.93/tests/providers/local-pbs-coasters/pads/001-catsn.setup.sh (rev 0)
+++ branches/release-0.93/tests/providers/local-pbs-coasters/pads/001-catsn.setup.sh 2011-08-05 05:14:57 UTC (rev 4947)
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cp -v $GROUP/data.txt . || exit 1
+cp -v $GROUP/*expected . || exit 1
Deleted: branches/release-0.93/tests/providers/local-pbs-coasters/pads/001-catsn.swift
===================================================================
--- trunk/tests/providers/local-pbs-coasters/pads/001-catsn.swift 2011-08-05 00:18:28 UTC (rev 4946)
+++ branches/release-0.93/tests/providers/local-pbs-coasters/pads/001-catsn.swift 2011-08-05 05:14:57 UTC (rev 4947)
@@ -1,15 +0,0 @@
-type file;
-
-app (file o) cat (file i)
-{
- cat @i stdout=@o;
-}
-
-string t = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-string char[] = @strsplit(t, "");
-
-file out[]<simple_mapper; location=".", prefix="catsn.",suffix=".out">;
-foreach j in [1:@toint(@arg("n","10"))] {
- file data<"data.txt">;
- out[j] = cat(data);
-}
Copied: branches/release-0.93/tests/providers/local-pbs-coasters/pads/001-catsn.swift (from rev 4946, trunk/tests/providers/local-pbs-coasters/pads/001-catsn.swift)
===================================================================
--- branches/release-0.93/tests/providers/local-pbs-coasters/pads/001-catsn.swift (rev 0)
+++ branches/release-0.93/tests/providers/local-pbs-coasters/pads/001-catsn.swift 2011-08-05 05:14:57 UTC (rev 4947)
@@ -0,0 +1,15 @@
+type file;
+
+app (file o) cat (file i)
+{
+ cat @i stdout=@o;
+}
+
+string t = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+string char[] = @strsplit(t, "");
+
+file out[]<simple_mapper; location=".", prefix="catsn.",suffix=".out">;
+foreach j in [1:@toint(@arg("n","10"))] {
+ file data<"data.txt">;
+ out[j] = cat(data);
+}
Deleted: branches/release-0.93/tests/providers/local-pbs-coasters/pads/001-catsn.timeout
===================================================================
--- trunk/tests/providers/local-pbs-coasters/pads/001-catsn.timeout 2011-08-05 00:18:28 UTC (rev 4946)
+++ branches/release-0.93/tests/providers/local-pbs-coasters/pads/001-catsn.timeout 2011-08-05 05:14:57 UTC (rev 4947)
@@ -1,2 +0,0 @@
-7200
-
Copied: branches/release-0.93/tests/providers/local-pbs-coasters/pads/001-catsn.timeout (from rev 4946, trunk/tests/providers/local-pbs-coasters/pads/001-catsn.timeout)
===================================================================
--- branches/release-0.93/tests/providers/local-pbs-coasters/pads/001-catsn.timeout (rev 0)
+++ branches/release-0.93/tests/providers/local-pbs-coasters/pads/001-catsn.timeout 2011-08-05 05:14:57 UTC (rev 4947)
@@ -0,0 +1,2 @@
+7200
+
Deleted: branches/release-0.93/tests/providers/local-pbs-coasters/pads/data.txt
===================================================================
--- trunk/tests/providers/local-pbs-coasters/pads/data.txt 2011-08-05 00:18:28 UTC (rev 4946)
+++ branches/release-0.93/tests/providers/local-pbs-coasters/pads/data.txt 2011-08-05 05:14:57 UTC (rev 4947)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93/tests/providers/local-pbs-coasters/pads/data.txt (from rev 4946, trunk/tests/providers/local-pbs-coasters/pads/data.txt)
===================================================================
--- branches/release-0.93/tests/providers/local-pbs-coasters/pads/data.txt (rev 0)
+++ branches/release-0.93/tests/providers/local-pbs-coasters/pads/data.txt 2011-08-05 05:14:57 UTC (rev 4947)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93/tests/providers/local-pbs-coasters/pads/sites.template.xml
===================================================================
--- trunk/tests/providers/local-pbs-coasters/pads/sites.template.xml 2011-08-05 00:18:28 UTC (rev 4946)
+++ branches/release-0.93/tests/providers/local-pbs-coasters/pads/sites.template.xml 2011-08-05 05:14:57 UTC (rev 4947)
@@ -1,17 +0,0 @@
-<config>
-<pool handle="local-pbs-coasters">
- <execution jobmanager="local:pbs" provider="coaster" url="none"/>
- <filesystem provider="local" url="none" />
- <profile namespace="globus" key="maxWallTime">1</profile>
- <profile namespace="globus" key="maxTime">7200</profile>
- <profile key="jobsPerNode" namespace="globus">1</profile>
- <profile key="slots" namespace="globus">1</profile>
- <profile key="nodeGranularity" namespace="globus">1</profile>
- <profile key="maxNodes" namespace="globus">1</profile>
- <profile key="queue" namespace="globus">_QUEUE_</profile>
- <profile key="jobThrottle" namespace="karajan">5.99</profile>
- <profile key="initialScore" namespace="karajan">10000</profile>
- <profile namespace="globus" key="project">_PROJECT_</profile>
- <workdirectory>_WORK_</workdirectory>
-</pool>
-</config>
Copied: branches/release-0.93/tests/providers/local-pbs-coasters/pads/sites.template.xml (from rev 4946, trunk/tests/providers/local-pbs-coasters/pads/sites.template.xml)
===================================================================
--- branches/release-0.93/tests/providers/local-pbs-coasters/pads/sites.template.xml (rev 0)
+++ branches/release-0.93/tests/providers/local-pbs-coasters/pads/sites.template.xml 2011-08-05 05:14:57 UTC (rev 4947)
@@ -0,0 +1,17 @@
+<config>
+<pool handle="local-pbs-coasters">
+ <execution jobmanager="local:pbs" provider="coaster" url="none"/>
+ <filesystem provider="local" url="none" />
+ <profile namespace="globus" key="maxWallTime">1</profile>
+ <profile namespace="globus" key="maxTime">7200</profile>
+ <profile key="jobsPerNode" namespace="globus">1</profile>
+ <profile key="slots" namespace="globus">1</profile>
+ <profile key="nodeGranularity" namespace="globus">1</profile>
+ <profile key="maxNodes" namespace="globus">1</profile>
+ <profile key="queue" namespace="globus">_QUEUE_</profile>
+ <profile key="jobThrottle" namespace="karajan">5.99</profile>
+ <profile key="initialScore" namespace="karajan">10000</profile>
+ <profile namespace="globus" key="project">_PROJECT_</profile>
+ <workdirectory>_WORK_</workdirectory>
+</pool>
+</config>
Deleted: branches/release-0.93/tests/providers/local-pbs-coasters/pads/tc.template.data
===================================================================
--- trunk/tests/providers/local-pbs-coasters/pads/tc.template.data 2011-08-05 00:18:28 UTC (rev 4946)
+++ branches/release-0.93/tests/providers/local-pbs-coasters/pads/tc.template.data 2011-08-05 05:14:57 UTC (rev 4947)
@@ -1,8 +0,0 @@
-local-pbs-coasters echo /bin/echo INSTALLED INTEL32::LINUX null
-local-pbs-coasters cat /bin/cat INSTALLED INTEL32::LINUX null
-local-pbs-coasters ls /bin/ls INSTALLED INTEL32::LINUX null
-local-pbs-coasters grep /bin/grep INSTALLED INTEL32::LINUX null
-local-pbs-coasters sort /bin/sort INSTALLED INTEL32::LINUX null
-local-pbs-coasters paste /bin/paste INSTALLED INTEL32::LINUX null
-local-pbs-coasters wc /usr/bin/wc INSTALLED INTEL32::LINUX null
-
Copied: branches/release-0.93/tests/providers/local-pbs-coasters/pads/tc.template.data (from rev 4946, trunk/tests/providers/local-pbs-coasters/pads/tc.template.data)
===================================================================
--- branches/release-0.93/tests/providers/local-pbs-coasters/pads/tc.template.data (rev 0)
+++ branches/release-0.93/tests/providers/local-pbs-coasters/pads/tc.template.data 2011-08-05 05:14:57 UTC (rev 4947)
@@ -0,0 +1,8 @@
+local-pbs-coasters echo /bin/echo INSTALLED INTEL32::LINUX null
+local-pbs-coasters cat /bin/cat INSTALLED INTEL32::LINUX null
+local-pbs-coasters ls /bin/ls INSTALLED INTEL32::LINUX null
+local-pbs-coasters grep /bin/grep INSTALLED INTEL32::LINUX null
+local-pbs-coasters sort /bin/sort INSTALLED INTEL32::LINUX null
+local-pbs-coasters paste /bin/paste INSTALLED INTEL32::LINUX null
+local-pbs-coasters wc /usr/bin/wc INSTALLED INTEL32::LINUX null
+
Deleted: branches/release-0.93/tests/providers/local-pbs-coasters/sites.template.xml
===================================================================
--- branches/release-0.93/tests/providers/local-pbs-coasters/sites.template.xml 2011-08-05 00:18:28 UTC (rev 4946)
+++ branches/release-0.93/tests/providers/local-pbs-coasters/sites.template.xml 2011-08-05 05:14:57 UTC (rev 4947)
@@ -1,17 +0,0 @@
-<config>
-<pool handle="local-pbs-coasters">
- <execution jobmanager="local:pbs" provider="coaster" url="none"/>
- <filesystem provider="local" url="none" />
- <profile namespace="globus" key="maxWallTime">1</profile>
- <profile namespace="globus" key="maxTime">7200</profile>
- <profile key="jobsPerNode" namespace="globus">1</profile>
- <profile key="slots" namespace="globus">1</profile>
- <profile key="nodeGranularity" namespace="globus">1</profile>
- <profile key="maxNodes" namespace="globus">1</profile>
- <profile key="queue" namespace="globus">_QUEUE_</profile>
- <profile key="jobThrottle" namespace="karajan">5.99</profile>
- <profile key="initialScore" namespace="karajan">10000</profile>
- <profile namespace="globus" key="project">_PROJECT_</profile>
- <workdirectory>_WORK_</workdirectory>
-</pool>
-</config>
Deleted: branches/release-0.93/tests/providers/local-pbs-coasters/tc.template.data
===================================================================
--- branches/release-0.93/tests/providers/local-pbs-coasters/tc.template.data 2011-08-05 00:18:28 UTC (rev 4946)
+++ branches/release-0.93/tests/providers/local-pbs-coasters/tc.template.data 2011-08-05 05:14:57 UTC (rev 4947)
@@ -1,8 +0,0 @@
-local-pbs-coasters echo /bin/echo INSTALLED INTEL32::LINUX null
-local-pbs-coasters cat /bin/cat INSTALLED INTEL32::LINUX null
-local-pbs-coasters ls /bin/ls INSTALLED INTEL32::LINUX null
-local-pbs-coasters grep /bin/grep INSTALLED INTEL32::LINUX null
-local-pbs-coasters sort /bin/sort INSTALLED INTEL32::LINUX null
-local-pbs-coasters paste /bin/paste INSTALLED INTEL32::LINUX null
-local-pbs-coasters wc /usr/bin/wc INSTALLED INTEL32::LINUX null
-
Modified: branches/release-0.93/tests/suite.sh
===================================================================
--- branches/release-0.93/tests/suite.sh 2011-08-05 00:18:28 UTC (rev 4946)
+++ branches/release-0.93/tests/suite.sh 2011-08-05 05:14:57 UTC (rev 4947)
@@ -97,7 +97,7 @@
HTML_COMMENTS=1
fi
-if [ $COLORIZE ]; then
+if (( $COLORIZE )); then
LGREEN="\033[1;32m"
YELLOW="\033[1;33m"
RED="\033[1;31m"
@@ -411,7 +411,7 @@
echo "| $G"
echo "|"
echo -e "\\----------------------------------------------------${GRAY}"
- echo
+ echo
if [ $TEXTREPORT == 1 ]; then
stars
printf "$G\n">>$REPORT
@@ -426,7 +426,7 @@
html "$G"
html_~th
html_~tr
-
+
html_tr group
html_td
html "#"
@@ -684,7 +684,7 @@
rm killed_test > /dev/null 2>&1 && sleep 5
verbose "killing monitor: $MONITOR_PID..."
kill $MONITOR_PID
-
+
INDIVIDUAL_TEST_TIME=$(( STOP-START ))
TOTAL_TIME=$(( INDIVIDUAL_TEST_TIME+TOTAL_TIME ))
echo -e "${YELLOW}TOOK (seconds): $INDIVIDUAL_TEST_TIME${GRAY}"
@@ -717,6 +717,7 @@
process_exec $SCRIPT
RESULT=$( result )
+ test_log
output_report test "$SYMBOL" "$LASTCMD" $RESULT
check_bailout
@@ -725,9 +726,9 @@
stage_files() {
GROUP=$1
NAME=$2
-
+
RESULT="None"
-
+
if [ -f $GROUP/$NAME.in ]; then
echo "Copying input: $NAME.in"
cp -v $GROUP/$NAME.in . 2>&1 >> $OUTPUT
@@ -749,18 +750,18 @@
RESULT="Passed"
fi
done
-
+
output_report test "s" "setup" $RESULT
-
+
check_bailout
}
check_outputs() {
GROUP=$1
NAME=$2
-
+
RESULT="None"
-
+
for EXPECTED in $GROUP/$NAME.*.expected; do
BNE=`basename $EXPECTED .expected`
echo -n "Checking output: $BNE "
@@ -775,15 +776,15 @@
RESULT="Passed"
fi
done
-
+
if [ "$RESULT" == "None" ]; then
html_td width 25
html " "
html_~td
fi
-
+
output_report test "√" "check" $RESULT
-
+
check_bailout
}
@@ -791,7 +792,7 @@
swift_test_case() {
SWIFTSCRIPT=$1
NAME=${SWIFTSCRIPT%.swift}
-
+
SETUPSCRIPT=$NAME.setup.sh
CHECKSCRIPT=$NAME.check.sh
CLEANSCRIPT=$NAME.clean.sh
@@ -804,12 +805,12 @@
else
stage_files $GROUP $NAME
fi
-
+
ARGS=""
if [ -f $GROUP/$ARGSFILE ]; then
ARGS=`cat $GROUP/$ARGSFILE`
fi
-
+
CDM=
[ -r fs.data ] && CDM="-cdm.file fs.data"
@@ -848,9 +849,9 @@
script_test_case() {
SHELLSCRIPT=$1
NAME=${SWIFTSCRIPT%.swift}
-
+
stage_files $GROUP $NAME
-
+
SETUPSCRIPT=$NAME.setup.sh
CHECKSCRIPT=$NAME.check.sh
CLEANSCRIPT=$NAME.clean.sh
More information about the Swift-commit
mailing list