[Swift-commit] r7675 - branches/release-0.94/tests branches/release-0.94/tests/documentation/tutorial branches/release-0.94/tests/functions branches/release-0.94/tests/groups branches/release-0.94/tests/language/working branches/release-0.94/tests/language-behaviour/IO branches/release-0.94/tests/language-behaviour/arrays branches/release-0.94/tests/language-behaviour/datatypes branches/release-0.94/tests/language-behaviour/mappers branches/release-0.94/tests/language-behaviour/math branches/release-0.94/tests/language-behaviour/strings branches/release-0.94/tests/language-behaviour/variables branches/release-0.94/tests/local branches/release-0.94/tests/multi_remote branches/release-0.94/tests/sites/beagle branches/release-0.94/tests/sites/blues branches/release-0.94/tests/sites/fusion branches/release-0.94/tests/sites/local branches/release-0.94/tests/sites/mac-frisbee branches/release-0.94/tests/sites/mcs branches/release-0.94/tests/sites/midway branches/release-0.94/tests/sites/ multiple_coaster_pools branches/release-0.94/tests/sites/raven branches/release-0.94/tests/sites/stampede branches/release-0.94/tests/sites/uc3 branches/release-0.94/tests/stress/IO/bagOnodes branches/release-0.94/tests/stress/IO/beagle branches/release-0.94/tests/stress/IO/multiple branches/release-0.94/tests/stress/IO/uc3 branches/release-0.94/tests/stress/apps/modis_beagle branches/release-0.94/tests/stress/apps/modis_local branches/release-0.94/tests/stress/apps/modis_midway branches/release-0.94/tests/stress/apps/modis_multiple branches/release-0.94/tests/stress/apps/modis_uc3 branches/release-0.94/tests/stress/internals branches/release-0.94/tests/stress/random_fail branches/release-0.94/tests/stress/user_profile tags/swift-0.94.1-RC3/tests/stress/local_cluster
yadunandb at ci.uchicago.edu
yadunandb at ci.uchicago.edu
Mon Mar 10 12:09:56 CDT 2014
Author: yadunandb
Date: 2014-03-10 12:09:55 -0500 (Mon, 10 Mar 2014)
New Revision: 7675
Modified:
branches/release-0.94/tests/README
branches/release-0.94/tests/USAGENOTES.txt
branches/release-0.94/tests/documentation/tutorial/sequential_iteration.setup.sh
branches/release-0.94/tests/functions/105-assert-loop.check.sh
branches/release-0.94/tests/functions/400-fprintf.check.sh
branches/release-0.94/tests/functions/450-tracef.check.sh
branches/release-0.94/tests/groups/group-daily-remote.sh
branches/release-0.94/tests/groups/group-multi-remote.sh
branches/release-0.94/tests/groups/group-stress-heavy.sh
branches/release-0.94/tests/language-behaviour/IO/readStructured01.swift
branches/release-0.94/tests/language-behaviour/arrays/020-array.clean.sh
branches/release-0.94/tests/language-behaviour/arrays/021-array-in-proc-param.clean.sh
branches/release-0.94/tests/language-behaviour/arrays/022-array-with-exprs.clean.sh
branches/release-0.94/tests/language-behaviour/arrays/025-array-passing.clean.sh
branches/release-0.94/tests/language-behaviour/arrays/027-array-assignment.clean.sh
branches/release-0.94/tests/language-behaviour/arrays/111-array-individual-assigns.clean.sh
branches/release-0.94/tests/language-behaviour/arrays/162-dot-on-array.clean.sh
branches/release-0.94/tests/language-behaviour/arrays/array_multidimensional_index.clean.sh
branches/release-0.94/tests/language-behaviour/arrays/q5.clean.sh
branches/release-0.94/tests/language-behaviour/datatypes/0231-complex-type.clean.sh
branches/release-0.94/tests/language-behaviour/datatypes/032-boolconst.clean.sh
branches/release-0.94/tests/language-behaviour/datatypes/053-pass-int.clean.sh
branches/release-0.94/tests/language-behaviour/datatypes/054-pass-int.clean.sh
branches/release-0.94/tests/language-behaviour/datatypes/055-pass-int.clean.sh
branches/release-0.94/tests/language-behaviour/mappers/073-simplemapper.swift
branches/release-0.94/tests/language-behaviour/mappers/076-structured-regexp-mapper.swift
branches/release-0.94/tests/language-behaviour/mappers/077-regexp-mapper.swift
branches/release-0.94/tests/language-behaviour/mappers/T078-simplemapper-nosuffix.swift
branches/release-0.94/tests/language-behaviour/math/006-add.clean.sh
branches/release-0.94/tests/language-behaviour/math/007-add-in-proc-add.clean.sh
branches/release-0.94/tests/language-behaviour/math/008-add-multiply.clean.sh
branches/release-0.94/tests/language-behaviour/math/009-multiply.clean.sh
branches/release-0.94/tests/language-behaviour/math/010-divide.clean.sh
branches/release-0.94/tests/language-behaviour/math/011-divide-float.clean.sh
branches/release-0.94/tests/language-behaviour/math/013-mod.clean.sh
branches/release-0.94/tests/language-behaviour/math/014-subtract.clean.sh
branches/release-0.94/tests/language-behaviour/math/0145-unary-subtact.clean.sh
branches/release-0.94/tests/language-behaviour/math/015-lesseq.clean.sh
branches/release-0.94/tests/language-behaviour/math/016-greatereq.clean.sh
branches/release-0.94/tests/language-behaviour/math/017-greater.clean.sh
branches/release-0.94/tests/language-behaviour/math/018-less.clean.sh
branches/release-0.94/tests/language-behaviour/math/019-equals.clean.sh
branches/release-0.94/tests/language-behaviour/math/0191-not-equals.clean.sh
branches/release-0.94/tests/language-behaviour/math/030-mix-float-int.clean.sh
branches/release-0.94/tests/language-behaviour/math/031-add-float.clean.sh
branches/release-0.94/tests/language-behaviour/strings/003-strcat.clean.sh
branches/release-0.94/tests/language-behaviour/strings/0031-strcat-op.clean.sh
branches/release-0.94/tests/language-behaviour/strings/004-strcat-in-arg.clean.sh
branches/release-0.94/tests/language-behaviour/strings/005-strcut.clean.sh
branches/release-0.94/tests/language-behaviour/strings/0051-regexp.clean.sh
branches/release-0.94/tests/language-behaviour/strings/0052-regexp.clean.sh
branches/release-0.94/tests/language-behaviour/strings/0053-toint.clean.sh
branches/release-0.94/tests/language-behaviour/strings/0054-strsplit.clean.sh
branches/release-0.94/tests/language-behaviour/strings/103-quote.clean.sh
branches/release-0.94/tests/language-behaviour/strings/1031-quote.clean.sh
branches/release-0.94/tests/language-behaviour/strings/1032-singlequote.clean.sh
branches/release-0.94/tests/language-behaviour/strings/1033-singlequote.clean.sh
branches/release-0.94/tests/language-behaviour/strings/141-space-in-filename.clean.sh
branches/release-0.94/tests/language-behaviour/strings/142-space-and-quotes.clean.sh
branches/release-0.94/tests/language-behaviour/strings/1421-space-and-quotes.clean.sh
branches/release-0.94/tests/language-behaviour/strings/143-newlines.clean.sh
branches/release-0.94/tests/language-behaviour/strings/145-url.clean.sh
branches/release-0.94/tests/language-behaviour/strings/161-star-dot.clean.sh
branches/release-0.94/tests/language-behaviour/variables/120-local-vars.clean.sh
branches/release-0.94/tests/language-behaviour/variables/121-multi-return-vars.clean.sh
branches/release-0.94/tests/language-behaviour/variables/123-global-vars.clean.sh
branches/release-0.94/tests/language-behaviour/variables/1232-global-separate-assign.clean.sh
branches/release-0.94/tests/language/working/escapes.swift
branches/release-0.94/tests/local/tc.template.data
branches/release-0.94/tests/multi_remote/remote_driver.check.sh
branches/release-0.94/tests/multi_remote/remote_driver.setup.sh
branches/release-0.94/tests/multi_remote/remote_driver.source.sh
branches/release-0.94/tests/multi_remote/remote_driver.swift
branches/release-0.94/tests/multi_remote/sites.template.xml
branches/release-0.94/tests/multi_remote/tc.template.data
branches/release-0.94/tests/sites/beagle/sites.template.xml
branches/release-0.94/tests/sites/blues/sites.template.xml
branches/release-0.94/tests/sites/fusion/sites.template.xml
branches/release-0.94/tests/sites/local/sites.template.xml
branches/release-0.94/tests/sites/mac-frisbee/sites.template.xml
branches/release-0.94/tests/sites/mcs/sites.template.xml
branches/release-0.94/tests/sites/midway/sites.template.xml
branches/release-0.94/tests/sites/multiple_coaster_pools/multiple_coaster_pools.setup.sh
branches/release-0.94/tests/sites/raven/sites.template.xml
branches/release-0.94/tests/sites/stampede/sanity.setup.sh
branches/release-0.94/tests/sites/stampede/sites.template.xml
branches/release-0.94/tests/sites/uc3/sites.template.xml
branches/release-0.94/tests/stress/IO/bagOnodes/sites.template.xml
branches/release-0.94/tests/stress/IO/beagle/sites.template.xml
branches/release-0.94/tests/stress/IO/multiple/sites.template.xml
branches/release-0.94/tests/stress/IO/uc3/sites.template.xml
branches/release-0.94/tests/stress/apps/modis_beagle/modis.timeout
branches/release-0.94/tests/stress/apps/modis_beagle/sites.template.xml
branches/release-0.94/tests/stress/apps/modis_local/modis.timeout
branches/release-0.94/tests/stress/apps/modis_local/sites.template.xml
branches/release-0.94/tests/stress/apps/modis_midway/modis.timeout
branches/release-0.94/tests/stress/apps/modis_midway/sites.template.xml
branches/release-0.94/tests/stress/apps/modis_multiple/modis.timeout
branches/release-0.94/tests/stress/apps/modis_multiple/sites.template.xml
branches/release-0.94/tests/stress/apps/modis_uc3/modis.timeout
branches/release-0.94/tests/stress/apps/modis_uc3/sites.template.xml
branches/release-0.94/tests/stress/internals/swift.properties
branches/release-0.94/tests/stress/internals/tc.template.data
branches/release-0.94/tests/stress/internals/x_foreach.swift
branches/release-0.94/tests/stress/internals/x_recursion.args
branches/release-0.94/tests/stress/random_fail/sites.template.xml
branches/release-0.94/tests/stress/user_profile/user.source.sh
branches/release-0.94/tests/user_env.sh
tags/swift-0.94.1-RC3/tests/stress/local_cluster/sites.template.xml
tags/swift-0.94.1-RC3/tests/stress/local_cluster/sites.xml
Log:
Moving 0.95 tests to replace 0.94.
Modified: branches/release-0.94/tests/README
===================================================================
--- branches/release-0.94/tests/README 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/README 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,7 +1,7 @@
USAGENOTES contains instructions on how to operate the test suite.
It is an asciidoc document, in order to properly build it run the following command:
$ asciidoc -a toc USAGENOTES.txt
-It will generate an HTML file called USAGENOTES.html.
+It will generate an HTML file called USAGENOTES.
Warning:
asciidoc must be installed.
Modified: branches/release-0.94/tests/USAGENOTES.txt
===================================================================
--- branches/release-0.94/tests/USAGENOTES.txt 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/USAGENOTES.txt 2014-03-10 17:09:55 UTC (rev 7675)
@@ -36,7 +36,7 @@
have the conventional *_cog/modules/swift_* configuration,
and you have done an *ant dist*, you can run
*********************************************************
- suite.sh -t -o /tmp $PWD/tests/groups/group-all-local.sh
+ suite.sh -t -o /tmp $PWD/groups/group-all-local.sh
*********************************************************
or *cd* into */tmp* and run
**************************************************************
@@ -252,3 +252,12 @@
- *run-suite.sh*:
a. Wrapper for *suite.sh*.
b. Env variables set may be customized by user.
+
+- *meta.sh*:
+ a. Wrapper for *run-suite.sh*.
+ b. used to execute _run-suite/suite.sh_ from a remote site using *ssh*.
+
+.Example usage:
+*********************************************************************************************
+ meta.sh login.pads.ci.uchicago.edu /home/skenny/swift_runs/tests sites/pads-pbs-coasters.sh
+*********************************************************************************************
Modified: branches/release-0.94/tests/documentation/tutorial/sequential_iteration.setup.sh
===================================================================
--- branches/release-0.94/tests/documentation/tutorial/sequential_iteration.setup.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/documentation/tutorial/sequential_iteration.setup.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,3 +1,5 @@
#!/bin/bash
-echo 'echo -n $(wc -c < $1) > $2' > /tmp/wcl
-chmod +x /tmp/wcl
+if [ ! -f "/tmp/wcl" ]; then
+ echo 'echo -n $(wc -c < $1) > $2' > /tmp/wcl
+ chmod +x /tmp/wcl
+fi
Modified: branches/release-0.94/tests/functions/105-assert-loop.check.sh
===================================================================
--- branches/release-0.94/tests/functions/105-assert-loop.check.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/functions/105-assert-loop.check.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -4,7 +4,15 @@
grep I_IS_4 105-assert-loop.stdout || exit 1
-LINES=$( grep -c "i:" 105-assert-loop.stdout )
-[[ ${LINES} == 5 ]] || exit 1
+#
+# Assert fails the entire run whenever the assertion
+# fails, and not when the loop in which the assert statement
+# exists completes. It is therefore incorrect to assume anything
+# about the number of parallel iterations that are
+# completed when assert aborts everything.
+#
+#LINES=$( grep -c "i:" 105-assert-loop.stdout )
+#[[ ${LINES} == 5 ]] || exit 1
+
exit 0
Modified: branches/release-0.94/tests/functions/400-fprintf.check.sh
===================================================================
--- branches/release-0.94/tests/functions/400-fprintf.check.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/functions/400-fprintf.check.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -7,7 +7,7 @@
grep hello 400-fprintf-1.out || exit 1
-LINES=$( wc -l 400-fprintf-2.out | cut -d ' ' -f 1 )
+LINES=$( wc -l 400-fprintf-2.out | sed 's/^[ \t]*//' | cut -d ' ' -f 1 )
(( ${LINES} == 3 )) || exit 1
grep "hello: 32" 400-fprintf-3.out || exit 1
Modified: branches/release-0.94/tests/functions/450-tracef.check.sh
===================================================================
--- branches/release-0.94/tests/functions/450-tracef.check.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/functions/450-tracef.check.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -10,6 +10,6 @@
grep "pointer:.*Closed" 450-tracef.stdout || exit 1
[[ $( grep -c "WORD" 450-tracef.stdout ) == 2 ]] || exit 1
-[[ $( grep -o '\<WORD\>' 450-tracef.stdout | wc -l ) == 4 ]] || exit 1
+[[ $( grep -o '\<WORD\>' 450-tracef.stdout | wc -l | sed 's/^[ \t]*//' ) == 4 ]] || exit 1
exit 0
Modified: branches/release-0.94/tests/groups/group-daily-remote.sh
===================================================================
--- branches/release-0.94/tests/groups/group-daily-remote.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/groups/group-daily-remote.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,30 +1,64 @@
-
# GROUPLIST definition to run all local tests
-GROUPLIST=( # Site testing test-group
+GROUPLIST=( $TESTDIR/language/working \
+ $TESTDIR/local \
+ $TESTDIR/language/should-not-work \
+ # $TESTDIR/cdm \
+ # $TESTDIR/cdm/ps \
+ # $TESTDIR/cdm/star
+ $TESTDIR/language-behaviour/arrays \
+ $TESTDIR/language-behaviour/broken \
+ $TESTDIR/language-behaviour/compounds \
+ $TESTDIR/language-behaviour/control_structures \
+ $TESTDIR/language-behaviour/datatypes \
+ $TESTDIR/language-behaviour/IO \
+ $TESTDIR/language-behaviour/logic \
+ $TESTDIR/language-behaviour/mappers \
+ $TESTDIR/language-behaviour/math \
+ $TESTDIR/language-behaviour/params \
+ $TESTDIR/language-behaviour/procedures \
+ $TESTDIR/language-behaviour/strings \
+ $TESTDIR/language-behaviour/variables \
+ $TESTDIR/language-behaviour/cleanup \
+ $TESTDIR/bugs \
+ $TESTDIR/documentation/tutorial \
+ $TESTDIR/functions \
+
+ # Site testing test-group
$TESTDIR/sites/beagle \
$TESTDIR/sites/mcs \
$TESTDIR/sites/midway \
$TESTDIR/sites/uc3 \
- # Frisbee will fail due to Bug 1030
- #TESTDIR/sites/mac-frisbee \
-
- # Remote-cluster IO tests
- $TESTDIR/stress/IO/beagle \
+ # Frisbee will fail due to Bug 1030
+ $TESTDIR/sites/mac-frisbee \
+ $TESTDIR/sites/blues \
+ $TESTDIR/sites/fusion \
+ #$TESTDIR/sites/raven \
+
+ # Remote-cluster IO tests
+ $TESTDIR/stress/IO/beagle \
$TESTDIR/stress/IO/bagOnodes \
$TESTDIR/stress/IO/multiple \
$TESTDIR/stress/IO/uc3 \
- # Remote-cluster Apps tests - MODIS
+ # Language stress tests
+ $TESTDIR/stress/internals \
+
+ # Remote-cluster Apps tests - MODIS
$TESTDIR/stress/apps/modis_beagle \
$TESTDIR/stress/apps/modis_local \
- $TESTDIR/stress/apps/modis_midway \
- $TESTDIR/stress/apps/modis_uc3 \
- $TESTDIR/stress/apps/modis_multiple\
+ $TESTDIR/stress/apps/modis_midway \
+ $TESTDIR/stress/apps/modis_uc3 \
+ # $TESTDIR/stress/apps/modis_multiple\
- # Recursive Test invocation
- $TESTDIR/multi-remote
-
+ # Local cluster tests.
+ $TESTDIR/stress/local_cluster \
+ $TESTDIR/stress/random_fail \
+ $TESTDIR/stress/jobs_per_node \
+
+ # Recursive Test invocation
+ $TESTDIR/multi_remote
+
)
checkvars WORK
Modified: branches/release-0.94/tests/groups/group-multi-remote.sh
===================================================================
--- branches/release-0.94/tests/groups/group-multi-remote.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/groups/group-multi-remote.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -2,7 +2,8 @@
# GROUPLIST definition to run all local tests
GROUPLIST=(
- $TESTDIR/multi_remote \
+ #$TESTDIR/test_submitter \
+ $TESTDIR/multi_remote \
)
checkvars WORK
Modified: branches/release-0.94/tests/groups/group-stress-heavy.sh
===================================================================
--- branches/release-0.94/tests/groups/group-stress-heavy.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/groups/group-stress-heavy.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,8 +1,11 @@
# GROUPLIST definition to run all local tests \
GROUPLIST=(
- $TESTDIR/stress/IO \
- $TESTDIR/stress/internals \
+# $TESTDIR/stress/IO/beagle \
+# $TESTDIR/stress/IO/bagOnodes \
+# $TESTDIR/stress/IO/multiple \
+# $TESTDIR/stress/IO/uc3 \
+ $TESTDIR/stress/internals \
)
checkvars WORK
\ No newline at end of file
Modified: branches/release-0.94/tests/language/working/escapes.swift
===================================================================
--- branches/release-0.94/tests/language/working/escapes.swift 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language/working/escapes.swift 2014-03-10 17:09:55 UTC (rev 7675)
@@ -11,6 +11,9 @@
string x = "\"";
-string y = "\'";
+// Why are we escaping single-quotes?
+// string y = "\'";
+string y = "'";
+
string z = "\\";
Modified: branches/release-0.94/tests/language-behaviour/IO/readStructured01.swift
===================================================================
--- branches/release-0.94/tests/language-behaviour/IO/readStructured01.swift 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/IO/readStructured01.swift 2014-03-10 17:09:55 UTC (rev 7675)
@@ -4,4 +4,3 @@
matrix m;
m = readStructured("readStructured01.in");
-
Modified: branches/release-0.94/tests/language-behaviour/arrays/020-array.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/arrays/020-array.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/arrays/020-array.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 020-array-* 020-array.swiftx 020-array.kml 020-array.out || exit 1
+rm -r 020-array.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/arrays/021-array-in-proc-param.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/arrays/021-array-in-proc-param.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/arrays/021-array-in-proc-param.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 021-array-in-proc-param.out 021-array-in-proc-param-* 021-array-in-proc-param.kml 021-array-in-proc-param.swiftx || exit 1
+rm -r 021-array-in-proc-param.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/arrays/022-array-with-exprs.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/arrays/022-array-with-exprs.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/arrays/022-array-with-exprs.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 022-array-with-exprs-* 022-array-with-exprs.kml 022-array-with-exprs.swiftx 022-array-with-exprs.out || exit 1
+rm -r 022-array-with-exprs.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/arrays/025-array-passing.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/arrays/025-array-passing.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/arrays/025-array-passing.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 025-array-passing-* 025-array-passing.kml 025-array-passing.swiftx 025-array-passing.out || exit 1
+rm -r 025-array-passing.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/arrays/027-array-assignment.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/arrays/027-array-assignment.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/arrays/027-array-assignment.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 027-array-assignment.out 027-array-assignment-* 027-array-assignment.kml 027-array-assignment.swiftx || exit 1
+rm -r 027-array-assignment.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/arrays/111-array-individual-assigns.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/arrays/111-array-individual-assigns.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/arrays/111-array-individual-assigns.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 111-array-individual-assigns-* 111-array-individual-assigns.*ml 111-array-individual-assigns.out || exit 1
+rm -r 111-array-individual-assigns.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/arrays/162-dot-on-array.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/arrays/162-dot-on-array.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/arrays/162-dot-on-array.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 162-dot-on-array-* 162-dot-on-array.*ml 162-dot-on-array.out || exit 1
+rm -r 162-dot-on-array.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/arrays/array_multidimensional_index.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/arrays/array_multidimensional_index.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/arrays/array_multidimensional_index.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r array_multidimensional_index-* array_multidimensional_index.*ml array_multidimensional_index.out || exit 1
+rm -r array_multidimensional_index.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/arrays/q5.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/arrays/q5.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/arrays/q5.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r q5-* q5.*ml q5.out || exit 1
+rm -r q5.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/datatypes/0231-complex-type.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/datatypes/0231-complex-type.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/datatypes/0231-complex-type.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 0231-complex-type-* 0231-complex-type.*ml 0231-complex-type.out || exit 1
+rm -r 0231-complex-type.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/datatypes/032-boolconst.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/datatypes/032-boolconst.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/datatypes/032-boolconst.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 032-boolconst-* 032-boolconst.*ml 032-boolconst.*.out || exit 1
+rm -r 032-boolconst.*.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/datatypes/053-pass-int.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/datatypes/053-pass-int.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/datatypes/053-pass-int.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 053-pass-int-* 053-pass-int.*ml 053-pass-int.out || exit 1
+rm -r 053-pass-int.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/datatypes/054-pass-int.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/datatypes/054-pass-int.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/datatypes/054-pass-int.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 054-pass-int-* 054-pass-int.*ml 054-pass-int.out || exit 1
+rm -r 054-pass-int.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/datatypes/055-pass-int.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/datatypes/055-pass-int.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/datatypes/055-pass-int.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 055-pass-int-* 055-pass-int.*ml 055-pass-int.out || exit 1
+rm -r 055-pass-int.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/mappers/073-simplemapper.swift
===================================================================
--- branches/release-0.94/tests/language-behaviour/mappers/073-simplemapper.swift 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/mappers/073-simplemapper.swift 2014-03-10 17:09:55 UTC (rev 7675)
@@ -11,7 +11,7 @@
messagefile outfile <simple_mapper;
prefix="073-simplemapper",
- suffix="out">;
+ suffix=".out">;
outfile = write();
Modified: branches/release-0.94/tests/language-behaviour/mappers/076-structured-regexp-mapper.swift
===================================================================
--- branches/release-0.94/tests/language-behaviour/mappers/076-structured-regexp-mapper.swift 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/mappers/076-structured-regexp-mapper.swift 2014-03-10 17:09:55 UTC (rev 7675)
@@ -12,14 +12,14 @@
}
}
+messagefile outfile[] <simple_mapper; prefix="076-structured-regexp-mapper.a",suffix=".out", padding=1>;
-messagefile outfile <"076-structured-regexp-mapper.a.out">;
-messagefile outfile2 <structured_regexp_mapper;
- source=outfile,
- match="(.*)per.a(.*)",
- transform="\\1per.b\\2"
->;
+messagefile outfile2[] <structured_regexp_mapper;
+ source=outfile, match="(.*)per.a(.*)",
+ transform="\\1per.b\\2" >;
-outfile = greeting();
+foreach i in [0:1]{
+ outfile[i] = greeting();
+ outfile2[i] = greeting2(outfile[i]);
+}
-outfile2 = greeting2(outfile);
Modified: branches/release-0.94/tests/language-behaviour/mappers/077-regexp-mapper.swift
===================================================================
--- branches/release-0.94/tests/language-behaviour/mappers/077-regexp-mapper.swift 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/mappers/077-regexp-mapper.swift 2014-03-10 17:09:55 UTC (rev 7675)
@@ -6,10 +6,10 @@
}
}
-messagefile outfile <regexp_mapper;
- source="outfoo",
- match="(...)(.*)",
- transform="077-regexp-mapper.\\2.\\1">;
+messagefile infile <"077-regexpmapper-input.in">;
+messagefile outfile <regexp_mapper; source="infile",
+ match="(.*)in", transform=@strcat("077-regexp-mapper.foo.","\\1out")>;
+
outfile = greeting();
Modified: branches/release-0.94/tests/language-behaviour/mappers/T078-simplemapper-nosuffix.swift
===================================================================
--- branches/release-0.94/tests/language-behaviour/mappers/T078-simplemapper-nosuffix.swift 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/mappers/T078-simplemapper-nosuffix.swift 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,6 +1,12 @@
// this one is like test 073-simplemapper, but doesn't
// add the missing dot in front of the suffix
+// The behavior of the suffix parameter was changed in r6390.
+// The automatic adding of a dot to the suffix could be surprising
+// and it did not compensate by helping the user much. Since r6390
+// the user must specify the dot if it's to be part of the suffix.
+// and also removes the noauto parametr
+
type messagefile;
(messagefile t) write() {
@@ -10,7 +16,7 @@
}
messagefile outfile <simple_mapper;
- prefix="T078-simplemapper-nosuffix", noauto="true",
+ prefix="T078-simplemapper-nosuffix",
suffix="_nodot.out">;
outfile = write();
Modified: branches/release-0.94/tests/language-behaviour/math/006-add.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/math/006-add.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/math/006-add.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 006-add-* 006-add.*ml 006-add.out || exit 1
+rm -r 006-add.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/math/007-add-in-proc-add.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/math/007-add-in-proc-add.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/math/007-add-in-proc-add.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 007-add-in-proc-add-* 007-add-in-proc-add.*ml 007-add-in-proc-add.out || exit 1
+rm -r 007-add-in-proc-add.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/math/008-add-multiply.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/math/008-add-multiply.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/math/008-add-multiply.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 008-add-multiply-* 008-add-multiply.*ml 008-add-multiply.out || exit 1
+rm -r 008-add-multiply.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/math/009-multiply.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/math/009-multiply.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/math/009-multiply.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 009-multiply-* 009-multiply.*ml 009-multiply.out || exit 1
+rm -r 009-multiply.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/math/010-divide.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/math/010-divide.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/math/010-divide.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 010-divide-* 010-divide.*ml 010-divide.out || exit 1
+rm -r 010-divide.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/math/011-divide-float.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/math/011-divide-float.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/math/011-divide-float.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 011-divide-float-* 011-divide-float.*ml 011-divide-float.out || exit 1
+rm -r 011-divide-float.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/math/013-mod.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/math/013-mod.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/math/013-mod.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 013-mod-* 013-mod.*ml 013-mod.out || exit 1
+rm -r 013-mod.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/math/014-subtract.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/math/014-subtract.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/math/014-subtract.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 014-subtract-* 014-subtract.*ml 014-subtract.out || exit 1
+rm -r 014-subtract.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/math/0145-unary-subtact.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/math/0145-unary-subtact.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/math/0145-unary-subtact.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 0145-unary-subtact-* 0145-unary-subtact.*ml 0145-unary-subtact.out || exit 1
+rm -r 0145-unary-subtact.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/math/015-lesseq.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/math/015-lesseq.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/math/015-lesseq.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 015-lesseq-* 015-lesseq.*ml 015-lesseq.out || exit 1
+rm -r 015-lesseq.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/math/016-greatereq.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/math/016-greatereq.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/math/016-greatereq.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 016-greatereq-* 016-greatereq.*ml 016-greatereq.out || exit 1
+rm -r 016-greatereq.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/math/017-greater.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/math/017-greater.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/math/017-greater.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 017-greater-* 017-greater.*ml 017-greater.out || exit 1
+rm -r 017-greater.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/math/018-less.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/math/018-less.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/math/018-less.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 018-less-* 018-less.*ml 018-less.out || exit 1
+rm -r 018-less.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/math/019-equals.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/math/019-equals.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/math/019-equals.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 019-equals-* 019-equals.*ml 019-equals.out || exit 1
+rm -r 019-equals.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/math/0191-not-equals.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/math/0191-not-equals.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/math/0191-not-equals.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 0191-not-equals-* 0191-not-equals.*ml 0191-not-equals.out || exit 1
+rm -r 0191-not-equals.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/math/030-mix-float-int.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/math/030-mix-float-int.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/math/030-mix-float-int.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 030-mix-float-int-* 030-mix-float-int.*ml 030-mix-float-int.out || exit 1
+rm -r 030-mix-float-int.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/math/031-add-float.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/math/031-add-float.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/math/031-add-float.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 031-add-float-* 031-add-float.*ml 031-add-float.out || exit 1
+rm -r 031-add-float.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/strings/003-strcat.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/strings/003-strcat.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/strings/003-strcat.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 003-strcat-* 003-strcat.*ml 003-strcat.out || exit 1
+rm -r 003-strcat.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/strings/0031-strcat-op.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/strings/0031-strcat-op.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/strings/0031-strcat-op.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 0031-strcat-op-* 0031-strcat-op.*ml 0031-strcat-op.out || exit 1
+rm -r 0031-strcat-op.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/strings/004-strcat-in-arg.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/strings/004-strcat-in-arg.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/strings/004-strcat-in-arg.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 004-strcat-in-arg-* 004-strcat-in-arg.*ml 004-strcat-in-arg.out || exit 1
+rm -r 004-strcat-in-arg.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/strings/005-strcut.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/strings/005-strcut.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/strings/005-strcut.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 005-strcut-* 005-strcut.*ml 005-strcut.out || exit 1
+rm -r 005-strcut.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/strings/0051-regexp.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/strings/0051-regexp.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/strings/0051-regexp.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 0051-regexp-* 0051-regexp.*ml 0051-regexp.out || exit 1
+rm -r 0051-regexp.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/strings/0052-regexp.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/strings/0052-regexp.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/strings/0052-regexp.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 0052-regexp-* 0052-regexp.*ml 0052-regexp.out || exit 1
+rm -r 0052-regexp.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/strings/0053-toint.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/strings/0053-toint.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/strings/0053-toint.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 0053-toint-* 0053-toint.*ml 0053-toint.out || exit 1
+rm -r 0053-toint.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/strings/0054-strsplit.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/strings/0054-strsplit.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/strings/0054-strsplit.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 0054-strsplit-* 0054-strsplit.*ml 0054-strsplit.out || exit 1
+rm -r 0054-strsplit.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/strings/103-quote.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/strings/103-quote.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/strings/103-quote.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 103-quote-* 103-quote.*ml 103-quote.out || exit 1
+rm -r 103-quote.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/strings/1031-quote.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/strings/1031-quote.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/strings/1031-quote.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 1031-quote-* 1031-quote.*ml 1031-quote.out || exit 1
+rm -r 1031-quote.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/strings/1032-singlequote.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/strings/1032-singlequote.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/strings/1032-singlequote.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 1032-singlequote-* 1032-singlequote.*ml 1032-singlequote.out || exit 1
+rm -r 1032-singlequote.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/strings/1033-singlequote.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/strings/1033-singlequote.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/strings/1033-singlequote.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 1033-singlequote-* 1033-singlequote.*ml 1033-singlequote.out || exit 1
+rm -r 1033-singlequote.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/strings/141-space-in-filename.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/strings/141-space-in-filename.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/strings/141-space-in-filename.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 141-space-in-filename-* 141-space-in-filename.*ml 141-space-in-filename*.out || exit 1
+rm -r 141-space-in-filename*.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/strings/142-space-and-quotes.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/strings/142-space-and-quotes.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/strings/142-space-and-quotes.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 142-space-and-quotes-* 142-space-and-quotes.*ml 142-space-and-quotes*.out || exit 1
+rm -r 142-space-and-quotes*.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/strings/1421-space-and-quotes.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/strings/1421-space-and-quotes.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/strings/1421-space-and-quotes.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 1421-space-and-quotes-* 1421-space-and-quotes.*ml 1421-space-and-quotes*.out || exit 1
+rm -r 1421-space-and-quotes*.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/strings/143-newlines.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/strings/143-newlines.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/strings/143-newlines.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 143-newlines-* 143-newlines.*ml 143-newlines.out || exit 1
+rm -r 143-newlines.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/strings/145-url.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/strings/145-url.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/strings/145-url.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 145-url-* 145-url.*ml 145-url.out || exit 1
+rm -r 145-url.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/strings/161-star-dot.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/strings/161-star-dot.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/strings/161-star-dot.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 161-star-dot-* 161-star-dot.*ml 161-star-dot.out || exit 1
+rm -r 161-star-dot.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/variables/120-local-vars.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/variables/120-local-vars.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/variables/120-local-vars.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 120-local-vars-* 120-local-vars.*ml 120-local-vars.out || exit 1
+rm -r 120-local-vars.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/variables/121-multi-return-vars.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/variables/121-multi-return-vars.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/variables/121-multi-return-vars.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 121-multi-return-vars-* 121-multi-return-vars.*ml 121-multi-return-vars.*.out || exit 1
+rm -r 121-multi-return-vars.*.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/variables/123-global-vars.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/variables/123-global-vars.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/variables/123-global-vars.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 123-global-vars-* 123-global-vars.*ml 123-global-vars.out || exit 1
+rm -r 123-global-vars.out || exit 1
exit 0
Modified: branches/release-0.94/tests/language-behaviour/variables/1232-global-separate-assign.clean.sh
===================================================================
--- branches/release-0.94/tests/language-behaviour/variables/1232-global-separate-assign.clean.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/language-behaviour/variables/1232-global-separate-assign.clean.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,4 @@
#!/bin/bash
set -x
-rm -r 1232-global-separate-assign-* 1232-global-separate-assign.*ml 1232-global-separate-assign.out || exit 1
+rm -r 1232-global-separate-assign.out || exit 1
exit 0
Modified: branches/release-0.94/tests/local/tc.template.data
===================================================================
--- branches/release-0.94/tests/local/tc.template.data 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/local/tc.template.data 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,20 +1,2 @@
-#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 nul
-localhost touch /bin/touch INSTALLED INTEL32::LINUX null
-
+* * * INSTALLED INTEL32::LINUX null
localhost append _DIR_/append.sh INSTALLED INTEL32::LINUX null
Modified: branches/release-0.94/tests/multi_remote/remote_driver.check.sh
===================================================================
--- branches/release-0.94/tests/multi_remote/remote_driver.check.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/multi_remote/remote_driver.check.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,48 +1,105 @@
#!/bin/bash
+PUBLISH_LOCATION=/scratch/midway/yadunand/publish
+PUBLISH_SERVER=http://swift.rcc.uchicago.edu:8042
+DATE=$(date +%H%M%S)
+
+[ ! -z $FROM_MAIL ] || FROM_MAIL="test-engine at swift.rcc.uchicago"
+#[ ! -z $TO_MAIL ] || TO_MAIL="yadudoc1729 at gmail.com"
+
if [ -d "swift" ]
then
- rm -rf swift swift.tar
+ rm -rf swift swift.tar
fi
SITES_PASSED=`ls out/*out | wc -l`
HOME=$PWD
MAIL="$HOME/Mail.content"
+VERSION=`grep "^Swift.*swift-.*cog.*" remote_driver.stdout | cut -d " " -f -2 | sed 's/\ /-/g' | tr '[A-Z]' '[a-z]'`
+#VERSION="swift-trunk"
cd out;
echo "Test-Results" > $MAIL
-echo "=====================================">> $MAIL
+echo "==========================================================================">> $MAIL
echo "Test home : $PWD" >> $MAIL
echo "Sites successful : $SITES_PASSED" >> $MAIL
-VERSION=`swift -version | cut -d " " -f -2 | sed 's/\ /-/g' | tr '[A-Z]' '[a-z]'`
+#VERSION=`swift -version | cut -d " " -f -2 | sed 's/\ /-/g' | tr '[A-Z]' '[a-z]'`
for i in `ls *tar`
do
- scp $i ci:~/public_html/$VERSION/
+ echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++">> $MAIL
+ #scp $i ci:~/public_html/$VERSION/
tar -xf $i
- folder=`tar -tf $i | head -n 1`
+ folder=`tar -tf $i | head -n 1 | sed 's/\/$//'`
echo "Results for site : $folder" >> $MAIL
- grep "Tests run" $folder/run*/tests*html >> $MAIL
- grep "Tests succeeded" $folder/run*/tests*html >> $MAIL
- grep "Tests failed" $folder/run*/tests*html >> $MAIL
- grep "Total Time" $folder/run*/tests*html >> $MAIL
- echo ""
- rm -rf $folder
+
+ echo "GROUPS" | awk '{printf "%-40s\n", $0}' > t0
+ grep "Group" $folder/tests*html | sed 's/Group\ /G/' | cut -c -40 | awk '{printf "%-40s\n", $0}' >> t0
+
+ echo "RUN " | awk '{printf "%-5s\n", $0}' >t1
+ grep "Tests run" $folder/tests*html | sed 's/Tests\ run//' | awk '{printf "%-5s\n", $0}' >> t1
+
+ echo "PASS" | awk '{printf "%-5s\n", $0}' >t2
+ grep "Tests succeeded" $folder/tests*html | sed 's/Tests\ succeeded.//' | awk '{printf "%-5s\n", $0}' >> t2
+
+ echo "FAIL" | awk '{printf "%-5s\n", $0}' >t3
+ grep "Tests failed" $folder/tests*html | sed 's/Tests\ failed.//' | awk '{printf "%-5s\n", $0}' >> t3
+
+ echo "TIME" | awk '{printf "%-40s\n", $0}' >t4
+ grep "Total Time" $folder/tests*html | sed 's/Total\ Time://' | awk '{printf "%-5s\n", $0}' >> t4
+
+ pr -s'|' -tm t0 t1 t2 t3 t4 >> $MAIL
+ rm t{0,1,2,3,4}
+ HTML=$(basename $(ls $folder/tests*html))
+ echo "Link: $PUBLISH_SERVER/$VERSION/$folder-$DATE/$HTML" >> $MAIL
+ mkdir -p $PUBLISH_LOCATION/$VERSION
+ mv $folder $PUBLISH_LOCATION/$VERSION/$folder-$DATE
done
cd $HOME;
cd ..;
RUN_DIR=$(basename $PWD);
cd ..;
-mv $RUN_DIR "$RUN_DIR-local"
-tar -cf Local.tar "$RUN_DIR-local"
-scp Local.tar ci:~/public_html/$VERSION/
-echo "Running update and maintenance script on publish server";
-ssh ci "cd ~/public_html/$VERSION/; ./maint.sh"
-mv "$RUN_DIR-local" $RUN_DIR
-rm Local.tar
+folder=$RUN_DIR
+HTML=$(basename $(ls $folder/tests*html))
-echo "=====================================">> $MAIL
-cd $HOME;
+echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++">> $MAIL
+echo "Results for site : LOCAL at $RUN_DIR-$DATE" >> $MAIL
+echo "GROUPS" | awk '{printf "%-40s\n", $0}' > t0
+grep "Group" $folder/tests*html | sed 's/Group\ /G/' | cut -c -40 | awk '{printf "%-40s\n", $0}' >> t0
+
+echo "RUN " | awk '{printf "%-5s\n", $0}' >t1
+grep "Tests run" $folder/tests*html | sed 's/Tests\ run//' | awk '{printf "%-5s\n", $0}' >> t1
+
+echo "PASS" | awk '{printf "%-5s\n", $0}' >t2
+grep "Tests succeeded" $folder/tests*html | sed 's/Tests\ succeeded.//' | awk '{printf "%-5s\n", $0}' >> t2
+
+echo "FAIL" | awk '{printf "%-5s\n", $0}' >t3
+grep "Tests failed" $folder/tests*html | sed 's/Tests\ failed.//' | awk '{printf "%-5s\n", $0}' >> t3
+
+echo "TIME" | awk '{printf "%-40s\n", $0}' >t4
+grep "Total Time" $folder/tests*html | sed 's/Total\ Time://' | awk '{printf "%-5s\n", $0}' >> t4
+
+pr -s'|' -tm t0 t1 t2 t3 t4 >> $MAIL
+rm t{0,1,2,3,4}
+
+echo "RUN_DIR = $RUN_DIR"
+echo "Moving $RUN_DIR to $PUBLISH_LOCATION/$RUN_DIR-$DATE"
+echo "Link: $PUBLISH_SERVER/$VERSION/$RUN_DIR-$DATE/$HTML" >> $MAIL
+echo "==========================================================================">> $MAIL
cat $MAIL
-mailx -s "Test results from $HOSTNAME" -r $FROM_MAIL $TO_MAIL < $MAIL
+echo "Mail: mailx -s \"Test results from $HOSTNAME\" -r $FROM_MAIL ${TO_MAIL[*]} < $MAIL"
+
+mailx -s "Test results from $HOSTNAME" -r $FROM_MAIL ${TO_MAIL[*]} < $MAIL
+
+cp -R $folder $PUBLISH_LOCATION/$VERSION/$RUN_DIR-$DATE &
+
+echo "Publishing links to CI from $MAIL"
+grep -o "http.*" $MAIL | tee result_links.txt
+
+DATE=$(date +%Y-%m-%d)
+echo "Posting result_links.txt to /ci/www/projects/swift/tests/$VERSION/run-$DATE/"
+cat result_links.txt
+scp result_links.txt ci:/ci/www/projects/swift/tests/$VERSION/run-$DATE/
+
+exit 0
Modified: branches/release-0.94/tests/multi_remote/remote_driver.setup.sh
===================================================================
--- branches/release-0.94/tests/multi_remote/remote_driver.setup.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/multi_remote/remote_driver.setup.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,20 +1,21 @@
#!/bin/bash
-#CLEAN_CHECKOUT="yes"
-CLEAN_CHECKOUT="no"
-
-#[ ! -z $COG_URL ] || COG_URL=https://cogkit.svn.sourceforge.net/svnroot/cogkit/branches/4.1.10/src/cog
-#[ ! -z $SWIFT_URL ] || SWIFT_URL=https://svn.ci.uchicago.edu/svn/vdl2/branches/release-0.94
-[ ! -z $COG_URL ] || COG_URL=https://svn.code.sf.net/p/cogkit/svn/branches/4.1.10/src/cog
-[ ! -z $SWIFT_URL ] || SWIFT_URL=https://svn.ci.uchicago.edu/svn/vdl2/branches/release-0.94
-[ ! -z $SWIFT_VERSION ] || SWIFT_VERSION=0.94
+[ ! -z $COG_URL ] || COG_URL=https://svn.code.sf.net/p/cogkit/svn/branches/4.1.11/src/cog
+[ ! -z $SWIFT_URL ] || SWIFT_URL=https://svn.ci.uchicago.edu/svn/vdl2/branches/release-0.95
+[ ! -z $SWIFT_VERSION ] || SWIFT_VERSION=0.95
[ ! -z $BEAGLE_USERNAME ] || BEAGLE_USERNAME="yadunandb"
[ ! -z $MIDWAY_USERNAME ] || MIDWAY_USERNAME="yadunand"
[ ! -z $UC3_USERNAME ] || UC3_USERNAME="yadunand"
-[ ! -z $MCS_USERNAME ] || MCS_USERNAME="yadunand"
+[ ! -z $MCS_USERNAME ] || MCS_USERNAME="yadunand"
+[ ! -z $FUSION_USERNAME ] || FUSION_USERNAME="yadunand"
+[ ! -z $BLUES_USERNAME ] || BLUES_USERNAME="yadunand"
+[ ! -z $BRID_USERNAME ] || BRID_USERNAME="yadunandb" # Bridled
+[ ! -z $COMM_USERNAME ] || COMM_USERNAME="yadunandb" # Communicado
[ ! -z $PUBLISH_FOLDER ] || PUBLISH_FOLDER="\/home\/yadunandb\/public_html\/results"
[ ! -z $SWIFT_SOURCE ] || SWIFT_SOURCE="/home/yadunand/swift"
[ ! -z $RUN_TYPE ] || RUN_TYPE="daily"
+[ ! -z $SWIFT_TAR_FILE ] || SWIFT_TAR_FILE="/scratch/midway/yadunand/swift-trunk.tar"
+[ ! -z $CLEAN_CHECKOUT ] || CLEAN_CHECKOUT="yes"
SITES="sites.xml"
cp $SITES $SITES.bak
@@ -23,15 +24,18 @@
cat $SITES | sed "s/UC3_USERNAME/$UC3_USERNAME/g" > tmp && mv tmp $SITES
cat $SITES | sed "s/MCS_USERNAME/$MCS_USERNAME/g" > tmp && mv tmp $SITES
cat $SITES | sed "s/PUBLISH_FOLDER/$PUBLISH_FOLDER/g" > tmp && mv tmp $SITES
+cat $SITES | sed "s/BRID_USERNAME/$BRID_USERNAME/g" > tmp && mv tmp $SITES
+cat $SITES | sed "s/COMM_USERNAME/$COMM_USERNAME/g" > tmp && mv tmp $SITES
+cat $SITES | sed "s/FUSION_USERNAME/$FUSION_USERNAME/g" > tmp && mv tmp $SITES
+cat $SITES | sed "s/BLUES_USERNAME/$BLUES_USERNAME/g" > tmp && mv tmp $SITES
-
export GLOBUS_HOSTNAME="swift.rcc.uchicago.edu"
BASE=$PWD
-# Make clean checkout if no swift dir is present or
+# Make clean checkout if no swift dir is present or
# Clean checkout requested
-[ -f "/scratch/midway/yadunand/swift.tar" ] && cp /scratch/midway/yadunand/swift.tar ./
+[ -f "$SWIFT_TAR_FILE" ] && cp $SWIFT_TAR_FILE ./swift.tar
if [ "$REMOTE_DRIVER_FASTSETUP" == "true" ]
then
@@ -39,42 +43,42 @@
else
if [ -f "swift.tar" ]
then
- echo "Found swift.tar. Extracting.."
- tar -xf swift.tar
+ echo "Found swift.tar. Extracting.."
+ tar -xf swift.tar
fi
-
- if [ "CLEAN_CHECKOUT" == "yes" ] || [ ! -d "swift" ]
+
+ if [ "$CLEAN_CHECKOUT" == "yes" ] || [ ! -d "swift" ]
then
- echo "Cleaning and making fresh checkout"
- rm -rf swift &> /dev/null
- mkdir swift && cd swift
- svn co $COG_URL
- cd cog/modules
- svn co $SWIFT_URL swift
- cd swift
+ echo "Cleaning and making fresh checkout"
+ rm -rf swift &> /dev/null
+ mkdir swift && cd swift
+ svn co $COG_URL
+ cd cog/modules
+ svn co $SWIFT_URL swift
+ cd swift
else
- echo "Updating Cog sources"
- cd swift/
- svn up *
- echo "Updating Swift sources"
- cd cog/modules/swift
+ echo "Updating Cog sources"
+ cd swift/
+ svn up *
+ echo "Updating Swift sources"
+ cd cog/modules/swift
svn up *
fi
-
+
echo "$PWD : Starting compile"
ant redist | tee $BASE/compile.log
if [ "$?" != "0" ]
then
- echo "Swift compile failed. Cannot proceed"
- exit 1
+ echo "Swift compile failed. Cannot proceed"
+ exit 1
fi
cd $BASE
if [ -d "swift" ]
then
- tar -cf swift.tar.tmp ./swift && mv swift.tar.tmp swift.tar && echo "Tarred successfully"
+ tar -cf swift.tar.tmp ./swift && mv swift.tar.tmp swift.tar && echo "Tarred successfully"
else
- echo "Could not find swift folder to tar"
+ echo "Could not find swift folder to tar"
fi;
fi
Modified: branches/release-0.94/tests/multi_remote/remote_driver.source.sh
===================================================================
--- branches/release-0.94/tests/multi_remote/remote_driver.source.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/multi_remote/remote_driver.source.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -2,5 +2,4 @@
if [ "$HOSTNAME" == "midway001" ]
then
export GLOBUS_HOSTNAME=swift.rcc.uchicago.edu
- export GLOBUS_TCP_PORT_RANGE=50000,51000
fi;
Modified: branches/release-0.94/tests/multi_remote/remote_driver.swift
===================================================================
--- branches/release-0.94/tests/multi_remote/remote_driver.swift 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/multi_remote/remote_driver.swift 2014-03-10 17:09:55 UTC (rev 7675)
@@ -9,7 +9,7 @@
file err[] <simple_mapper;prefix="out/driver", suffix=".err">;
file log[] <simple_mapper;prefix="out/Logs_", suffix=".tar">;
-string sites[] = ["uc3", "beagle", "midway", "crush", "frisbee"];
+string sites[] = ["uc3", "beagle", "midway", "crush", "frisbee", "blues", "fusion", "bridled", "communicado"];
app (file out, file err, file log) remote_uc3 (script run, file tar)
{
@@ -36,6 +36,27 @@
fsb @run @filename(tar) @log stdout=@filename(out) stderr=@filename(err);
}
+app (file out, file err, file log) remote_blues (script run, file tar)
+{
+ blu @run @filename(tar) @log stdout=@filename(out) stderr=@filename(err);
+}
+
+app (file out, file err, file log) remote_fusion (script run, file tar)
+{
+ fus @run @filename(tar) @log stdout=@filename(out) stderr=@filename(err);
+}
+
+app (file out, file err, file log) remote_communicado (script run, file tar)
+{
+ com @run @filename(tar) @log stdout=@filename(out) stderr=@filename(err);
+}
+
+app (file out, file err, file log) remote_bridled (script run, file tar)
+{
+ bri @run @filename(tar) @log stdout=@filename(out) stderr=@filename(err);
+}
+
+
app (file out, file err) publish_results (script publish, file tar, file out, file err)
{
pub @publish stdout=@out stderr=@err;
@@ -50,21 +71,35 @@
switch(i)
{
- case 0:
- tracef("Calling uc3\n");
- //(out[i], err[i], log[i]) = remote_uc3 (wrapper, swift_package);
+ case 0:
+ tracef("Calling uc3\n");
+ (out[i], err[i], log[i]) = remote_uc3 (wrapper, swift_package);
case 1:
- tracef("Calling beagle \n");
- //(out[i], err[i], log[i]) = remote_beagle (wrapper, swift_package);
- case 2:
- tracef("Calling Midway\n");
- //(out[i], err[i], log[i]) = remote_midway (wrapper, swift_package);
- case 3:
- tracef("Calling thwomp on MCS\n");
- (out[i], err[i], log[i]) = remote_mcs (wrapper, swift_package);
- case 4:
- tracef("Skipping Frisbee on MCS (Will fail due to BUG:1030)\n");
- //(out[i], err[i], log[i]) = remote_frisbee(wrapper, swift_package);
+ tracef("Calling beagle \n");
+ (out[i], err[i], log[i]) = remote_beagle (wrapper, swift_package);
+ case 2:
+ tracef("Skipping Midway : Tests will be run locally\n");
+ (out[i], err[i], log[i]) = remote_midway (wrapper, swift_package);
+ case 3:
+ tracef("Calling thwomp on MCS\n");
+ (out[i], err[i], log[i]) = remote_mcs (wrapper, swift_package);
+ case 4:
+ tracef("Skipping Frisbee on MCS (Will fail due to BUG:1030)\n");
+ //(out[i], err[i], log[i]) = remote_frisbee (wrapper, swift_package);
+ case 5:
+ tracef("Calling Blues\n");
+ (out[i], err[i], log[i]) = remote_blues (wrapper, swift_package);
+ case 6:
+ tracef("Calling Fusion\n");
+ (out[i], err[i], log[i]) = remote_fusion (wrapper, swift_package);
+ case 7:
+ tracef("Calling Communicado\n");
+ (out[i], err[i], log[i]) = remote_communicado (wrapper, swift_package);
+ case 8:
+ tracef("Calling Bridled\n");
+ (out[i], err[i], log[i]) = remote_bridled (wrapper, swift_package);
+
+
default:
tracef("Fail: Unknown site %s : %i \n", site, i);
}
Modified: branches/release-0.94/tests/multi_remote/sites.template.xml
===================================================================
--- branches/release-0.94/tests/multi_remote/sites.template.xml 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/multi_remote/sites.template.xml 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,5 @@
-<config>
+<?xml version="1.0" encoding="UTF-8"?>
+<config xmlns="http://www.ci.uchicago.edu/swift/SwiftSites">
<pool handle="local">
<execution provider="coaster" jobmanager="local:local"/>
@@ -35,7 +36,7 @@
<profile namespace="globus" key="jobsPerNode">24</profile>
<profile namespace="globus" key="lowOverAllocation">100</profile>
<profile namespace="globus" key="highOverAllocation">100</profile>
- <profile namespace="globus" key="providerAttributes">pbs.aprun;pbs.mpp;depth=24;pbs.resource_list=advres=wilde.1768</profile>
+ <profile namespace="globus" key="providerAttributes">pbs.aprun;pbs.mpp;depth=24;</profile>
<profile namespace="globus" key="maxtime">36000</profile>
<profile namespace="globus" key="maxWalltime">01:05:00</profile>
<profile namespace="globus" key="userHomeOverride">/lustre/beagle/BEAGLE_USERNAME/swiftwork</profile>
@@ -47,12 +48,47 @@
<workdirectory>/tmp/BEAGLE_USERNAME/swiftwork</workdirectory>
</pool>
+ <pool handle="blues">
+ <execution jobmanager="ssh-cl:local" provider="coaster" url="blogin1.lcrc.anl.gov"/>
+ <filesystem provider="local" url="none" />
+ <profile namespace="globus" key="maxtime">3600</profile>
+ <profile namespace="globus" key="maxtime">36000</profile>
+ <profile namespace="globus" key="maxWalltime">01:05:00</profile>
+ <profile namespace="globus" key="jobsPerNode">2</profile>
+ <profile namespace="globus" key="ppn">8</profile>
+ <profile namespace="globus" key="queue">route</profile>
+ <profile namespace="globus" key="slots">1</profile>
+ <profile namespace="globus" key="nodeGranularity">2</profile>
+ <profile namespace="globus" key="maxNodes">2</profile>
+ <profile namespace="karajan" key="jobThrottle">2.20</profile>
+ <profile namespace="karajan" key="initialScore">10000</profile>
+ <profile namespace="globus" key="HighOverAllocation">1000</profile>
+ <profile namespace="globus" key="LowOverAllocation">1000</profile>
+ <workdirectory>/tmp/BLUES_USERNAME/swiftwork</workdirectory>
+ </pool>
+ <pool handle="fusion">
+ <execution jobmanager="ssh-cl:local" provider="coaster" url="flogin1.lcrc.anl.gov"/>
+ <filesystem provider="local" url="none" />
+ <profile namespace="globus" key="maxtime">4000</profile>
+ <profile namespace="globus" key="maxWalltime">01:05:00</profile>
+ <profile namespace="globus" key="jobsPerNode">2</profile>
+ <profile namespace="globus" key="slots">1</profile>
+ <profile namespace="globus" key="nodeGranularity">2</profile>
+ <profile namespace="globus" key="maxNodes">2</profile>
+ <profile namespace="globus" key="queue">shared</profile>
+ <profile namespace="karajan" key="jobThrottle">5.99</profile>
+ <profile namespace="karajan" key="initialScore">10000</profile>
+ <profile namespace="globus" key="HighOverAllocation">1000</profile>
+ <profile namespace="globus" key="LowOverAllocation">1000</profile>
+ <workdirectory>/homes/FUSION_USERNAME/swiftwork</workdirectory>
+ </pool>
+
<pool handle="midway">
<execution provider="coaster" jobmanager="local:local"/>
<profile namespace="globus" key="queue">sandyb</profile>
<profile namespace="globus" key="jobsPerNode">16</profile>
- <profile namespace="globus" key="maxTime">36000</profile>
+ <profile namespace="globus" key="maxtime">36000</profile>
<profile namespace="globus" key="maxWalltime">01:05:00</profile>
<profile namespace="globus" key="highOverAllocation">100</profile>
<profile namespace="globus" key="lowOverAllocation">100</profile>
@@ -74,7 +110,7 @@
<profile namespace="globus" key="maxWalltime">01:05:00</profile>
<profile namespace="globus" key="highOverAllocation">100</profile>
<profile namespace="globus" key="lowOverAllocation">100</profile>
- <profile namespace="globus" key="slots">1000</profile>
+ <profile namespace="globus" key="slots">2</profile>
<profile namespace="globus" key="maxNodes">1</profile>
<profile namespace="globus" key="nodeGranularity">1</profile>
<!-- <profile namespace="globus" key="condor.+AccountingGroup">"group_friends.yadunand"</profile> -->
@@ -95,18 +131,42 @@
<workdirectory>/sandbox/MCS_USERNAME/swiftwork</workdirectory>
</pool>
-
<pool handle="frisbee">
<execution provider="coaster" jobmanager="ssh-cl:local" url="frisbee.mcs.anl.gov"/>
<profile namespace="globus" key="jobsPerNode">8</profile>
<profile namespace="globus" key="lowOverAllocation">100</profile>
<profile namespace="globus" key="highOverAllocation">100</profile>
- <profile namespace="globus" key="maxtime">3600</profile>
- <profile namespace="globus" key="maxWalltime">00:05:00</profile>
+ <profile namespace="globus" key="maxtime">4000</profile>
+ <profile namespace="globus" key="maxWalltime">01:05:00</profile>
<profile namespace="karajan" key="jobThrottle">0.0799</profile>
<profile namespace="karajan" key="initialScore">10000</profile>
<workdirectory>/sandbox/MCS_USERNAME/swiftwork</workdirectory>
</pool>
-
+ <pool handle="bridled">
+ <execution provider="coaster" jobmanager="ssh-cl:local" url="bridled.ci.uchicago.edu"/>
+ <profile namespace="globus" key="jobsPerNode">2</profile>
+ <profile namespace="globus" key="lowOverAllocation">100</profile>
+ <profile namespace="globus" key="highOverAllocation">100</profile>
+ <profile namespace="globus" key="maxtime">36000</profile>
+ <profile namespace="globus" key="maxWalltime">01:05:00</profile>
+ <profile namespace="karajan" key="jobThrottle">0.0799</profile>
+ <profile namespace="karajan" key="initialScore">10000</profile>
+ <profile namespace="globus" key="userHomeOverride">/home/BRID_USERNAME/swiftwork</profile>
+ <workdirectory>/home/BRID_USERNAME/swiftwork</workdirectory>
+ </pool>
+
+ <pool handle="communicado">
+ <execution provider="coaster" jobmanager="ssh-cl:local" url="communicado.ci.uchicago.edu"/>
+ <profile namespace="globus" key="jobsPerNode">2</profile>
+ <profile namespace="globus" key="lowOverAllocation">100</profile>
+ <profile namespace="globus" key="highOverAllocation">100</profile>
+ <profile namespace="globus" key="maxtime">36000</profile>
+ <profile namespace="globus" key="maxWalltime">01:05:00</profile>
+ <profile namespace="karajan" key="jobThrottle">0.0799</profile>
+ <profile namespace="karajan" key="initialScore">10000</profile>
+ <profile namespace="globus" key="userHomeOverride">/home/COMM_USERNAME/swiftwork</profile>
+ <workdirectory>/home/COMM_USERNAME/swiftwork</workdirectory>
+ </pool>
+
</config>
Modified: branches/release-0.94/tests/multi_remote/tc.template.data
===================================================================
--- branches/release-0.94/tests/multi_remote/tc.template.data 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/multi_remote/tc.template.data 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,6 +1,11 @@
-beagle bgl /bin/bash null null null
-uc3 uc3 /bin/bash null null null
-midway mid /bin/bash null null null
-mcs mcs /bin/bash null null null
-local l_bash /bin/bash null null null
-ci pub /bin/bash null null null
\ No newline at end of file
+beagle bgl /bin/bash null null null
+uc3 uc3 /bin/bash null null null
+midway mid /bin/bash null null null
+mcs mcs /bin/bash null null null
+local l_bash /bin/bash null null null
+ci pub /bin/bash null null null
+fusion fus /bin/bash null null null
+blues blu /bin/bash null null null
+frisbee fsb /bin/bash null null null
+communicado com /bin/bash null null null
+bridled bri /bin/bash null null null
\ No newline at end of file
Modified: branches/release-0.94/tests/sites/beagle/sites.template.xml
===================================================================
--- branches/release-0.94/tests/sites/beagle/sites.template.xml 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/sites/beagle/sites.template.xml 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,6 @@
-<config>
+<?xml version="1.0" encoding="UTF-8"?>
+<config xmlns="http://www.ci.uchicago.edu/swift/SwiftSites">
+
<pool handle="beagle">
<execution provider="coaster" jobmanager="ssh-cl:pbs" url="login4.beagle.ci.uchicago.edu"/>
<profile namespace="globus" key="jobsPerNode">24</profile>
@@ -8,10 +10,10 @@
<profile namespace="globus" key="maxtime">3700</profile>
<profile namespace="globus" key="maxWalltime">01:00:00</profile>
<profile namespace="globus" key="userHomeOverride">/lustre/beagle/{env.USER}/swiftwork</profile>
- <profile namespace="globus" key="slots">20</profile>
- <profile namespace="globus" key="maxnodes">10</profile>
+ <profile namespace="globus" key="slots">1</profile>
+ <profile namespace="globus" key="maxnodes">2</profile>
<profile namespace="globus" key="nodeGranularity">1</profile>
- <profile namespace="karajan" key="jobThrottle">4.80</profile>
+ <profile namespace="karajan" key="jobThrottle">1.00</profile>
<profile namespace="karajan" key="initialScore">10000</profile>
<profile namespace="karajan" key="workerLoggingLevel">trace</profile>
<!-- <workdirectory>/lustre/beagle/yadunandb/swiftwork</workdirectory> -->
Modified: branches/release-0.94/tests/sites/blues/sites.template.xml
===================================================================
--- branches/release-0.94/tests/sites/blues/sites.template.xml 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/sites/blues/sites.template.xml 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,15 +1,16 @@
-<config>
+<?xml version="1.0" encoding="UTF-8"?>
+<config xmlns="http://www.ci.uchicago.edu/swift/SwiftSites">
<pool handle="blues">
<execution jobmanager="ssh-cl:pbs" provider="coaster" url="blues.lcrc.anl.gov"/>
<filesystem provider="local" url="none" />
- <profile namespace="globus" key="maxWallTime">00:00:30</profile>
+ <profile namespace="globus" key="maxtime">3600</profile>
<profile namespace="globus" key="jobsPerNode">2</profile>
<profile namespace="globus" key="ppn">8</profile>
<profile namespace="globus" key="queue">route</profile>
<profile namespace="globus" key="slots">1</profile>
<profile namespace="globus" key="nodeGranularity">2</profile>
<profile namespace="globus" key="maxNodes">2</profile>
- <profile namespace="karajan" key="jobThrottle">2.20</profile>
+ <profile namespace="karajan" key="jobThrottle">1.00</profile>
<profile namespace="karajan" key="initialScore">10000</profile>
<workdirectory>/home/{env.USER}/swiftwork</workdirectory>
</pool>
Modified: branches/release-0.94/tests/sites/fusion/sites.template.xml
===================================================================
--- branches/release-0.94/tests/sites/fusion/sites.template.xml 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/sites/fusion/sites.template.xml 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,6 @@
-<config>
+<?xml version="1.0" encoding="UTF-8"?>
+<config xmlns="http://www.ci.uchicago.edu/swift/SwiftSites">
+
<pool handle="fusion">
<execution jobmanager="ssh-cl:pbs" provider="coaster" url="fusion.lcrc.anl.gov"/>
<filesystem provider="local" url="none" />
@@ -8,7 +10,7 @@
<profile namespace="globus" key="nodeGranularity">2</profile>
<profile namespace="globus" key="maxNodes">2</profile>
<profile namespace="globus" key="queue">shared</profile>
- <profile namespace="karajan" key="jobThrottle">5.99</profile>
+ <profile namespace="karajan" key="jobThrottle">1.00</profile>
<profile namespace="karajan" key="initialScore">10000</profile>
<workdirectory>/homes/{env.USER}/swiftwork</workdirectory>
</pool>
Modified: branches/release-0.94/tests/sites/local/sites.template.xml
===================================================================
--- branches/release-0.94/tests/sites/local/sites.template.xml 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/sites/local/sites.template.xml 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,7 +1,8 @@
-<config>
+<?xml version="1.0" encoding="UTF-8"?>
+<config xmlns="http://www.ci.uchicago.edu/swift/SwiftSites">
<pool handle="localhost">
- <execution provider="local" />
- <gridftp url="local://localhost" />
+ <execution provider="local"/>
+ <filesystem provider="local"/>
<profile key="initialScore" namespace="karajan">10000</profile>
<profile key="jobThrottle" namespace="karajan">.31</profile>
<workdirectory>_WORK_</workdirectory>
Modified: branches/release-0.94/tests/sites/mac-frisbee/sites.template.xml
===================================================================
--- branches/release-0.94/tests/sites/mac-frisbee/sites.template.xml 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/sites/mac-frisbee/sites.template.xml 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,6 @@
-<config>
+<?xml version="1.0" encoding="UTF-8"?>
+<config xmlns="http://www.ci.uchicago.edu/swift/SwiftSites">
+
<pool handle="frisbee">
<execution provider="coaster" jobmanager="ssh-cl:local" url="frisbee.mcs.anl.gov"/>
<profile namespace="globus" key="jobsPerNode">8</profile>
@@ -8,6 +10,6 @@
<profile namespace="globus" key="maxWalltime">00:05:00</profile>
<profile namespace="karajan" key="jobThrottle">0.0799</profile>
<profile namespace="karajan" key="initialScore">10000</profile>
- <workdirectory>/scratch/{env.USER}/swiftwork</workdirectory> -->
+ <workdirectory>/homes/{env.USER}/swiftwork</workdirectory>
</pool>
</config>
Modified: branches/release-0.94/tests/sites/mcs/sites.template.xml
===================================================================
--- branches/release-0.94/tests/sites/mcs/sites.template.xml 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/sites/mcs/sites.template.xml 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,5 @@
-<config>
+<?xml version="1.0" encoding="UTF-8"?>
+<config xmlns="http://www.ci.uchicago.edu/swift/SwiftSites">
<pool handle="crush">
<execution provider="coaster" jobmanager="ssh-cl:local" url="crush.mcs.anl.gov"/>
<profile namespace="globus" key="jobsPerNode">8</profile>
@@ -8,6 +9,7 @@
<profile namespace="globus" key="maxWalltime">00:05:00</profile>
<profile namespace="karajan" key="jobThrottle">0.0799</profile>
<profile namespace="karajan" key="initialScore">10000</profile>
+ <profile namespace="globus" key="userHomeOverride">/sandbox/{env.USER}/</profile>
<workdirectory>/sandbox/{env.USER}/swiftwork</workdirectory>
</pool>
</config>
Modified: branches/release-0.94/tests/sites/midway/sites.template.xml
===================================================================
--- branches/release-0.94/tests/sites/midway/sites.template.xml 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/sites/midway/sites.template.xml 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,15 +1,16 @@
-<config>
+<?xml version="1.0" encoding="UTF-8"?>
+<config xmlns="http://www.ci.uchicago.edu/swift/SwiftSites">
+
<pool handle="midway">
- <execution provider="coaster" jobmanager="local:slurm"/>
+ <execution provider="coaster" jobmanager="ssh-cl:slurm" url="swift.rcc.uchicago.edu"/>
<profile namespace="globus" key="queue">sandyb</profile>
- <profile namespace="globus" key="jobsPerNode">16</profile>
+ <profile namespace="globus" key="jobsPerNode">1</profile>
<profile namespace="globus" key="maxWalltime">00:05:00</profile>
- <profile namespace="globus" key="maxTime">3600</profile>
- <profile namespace="globus" key="highOverAllocation">100</profile>
- <profile namespace="globus" key="lowOverAllocation">100</profile>
- <profile namespace="globus" key="slots">4</profile>
+ <profile namespace="globus" key="maxTime">500</profile>
+ <profile namespace="globus" key="slots">1</profile>
<profile namespace="globus" key="maxNodes">1</profile>
<profile namespace="globus" key="nodeGranularity">1</profile>
+ <profile namespace="globus" key="slurm.exclusive">false</profile>
<profile namespace="karajan" key="jobThrottle">.64</profile>
<profile namespace="karajan" key="initialScore">10000</profile>
<workdirectory>/tmp/{env.USER}</workdirectory>
Modified: branches/release-0.94/tests/sites/multiple_coaster_pools/multiple_coaster_pools.setup.sh
===================================================================
--- branches/release-0.94/tests/sites/multiple_coaster_pools/multiple_coaster_pools.setup.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/sites/multiple_coaster_pools/multiple_coaster_pools.setup.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,5 @@
#!/bin/bash
cp -v ${GROUP}/hostsnsleep.sh . || exit 1
+sed -i s/\{env.USER\}/$USER/g sites.xml
exit 0
Modified: branches/release-0.94/tests/sites/raven/sites.template.xml
===================================================================
--- branches/release-0.94/tests/sites/raven/sites.template.xml 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/sites/raven/sites.template.xml 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,18 +1,19 @@
-<config>
+<?xml version="1.0" encoding="UTF-8"?>
+<config xmlns="http://www.ci.uchicago.edu/swift/SwiftSites">
<pool handle="raven">
- <execution provider="coaster" jobmanager="local:pbs"/>
+ <execution provider="coaster" jobmanager="ssh-cl:pbs" url="raven.cray.com"/>
<profile namespace="globus" key="project">CI-SES000031</profile>
<profile namespace="env" key="SWIFT_GEN_SCRIPTS">KEEP</profile>
<profile namespace="globus" key="jobsPerNode">24</profile>
<profile namespace="globus" key="providerAttributes">pbs.aprun;pbs.mpp;depth=24</profile>
<profile namespace="globus" key="maxWallTime">00:01:00</profile>
- <profile namespace="globus" key="slots">50</profile>
- <profile namespace="globus" key="nodeGranularity">2</profile>
- <profile namespace="globus" key="maxNodes">2</profile>
- <profile namespace="karajan" key="jobThrottle">60.99</profile>
+ <profile namespace="globus" key="slots">1</profile>
+ <profile namespace="globus" key="nodeGranularity">1</profile>
+ <profile namespace="globus" key="maxNodes">1</profile>
+ <profile namespace="karajan" key="jobThrottle">1.00</profile>
<profile namespace="karajan" key="initialScore">10000</profile>
<filesystem provider="local"/>
- <workdirectory>/home/users/p01537/swiftwork</workdirectory>
+ <workdirectory>/home/users/{env.USER}/swiftwork</workdirectory>
</pool>
</config>
Modified: branches/release-0.94/tests/sites/stampede/sanity.setup.sh
===================================================================
--- branches/release-0.94/tests/sites/stampede/sanity.setup.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/sites/stampede/sanity.setup.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,6 +1,6 @@
#!/bin/bash
-USERNAME=$STAMPEDE_USERNAME
+USERNAME=$BLUES_USERNAME
if [[ -z $USERNAME ]]
then
Modified: branches/release-0.94/tests/sites/stampede/sites.template.xml
===================================================================
--- branches/release-0.94/tests/sites/stampede/sites.template.xml 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/sites/stampede/sites.template.xml 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,22 +1,8 @@
-<config>
+<?xml version="1.0" encoding="UTF-8"?>
+<config xmlns="http://www.ci.uchicago.edu/swift/SwiftSites">
<pool handle="stampede">
- <execution provider="coaster" jobmanager="gt2:gt2:slurm" url="login5.stampede.tacc.utexas.edu:2119/jobmanager-slurm"/>
- <filesystem provider="gsiftp" url="gsiftp://gridftp.stampede.tacc.utexas.edu:2811"/>
- <profile namespace="globus" key="jobsPerNode">16</profile>
- <profile namespace="globus" key="ppn">16</profile>
- <profile namespace="globus" key="maxwalltime">00:00:30</profile>
- <profile namespace="globus" key="queue">normal</profile>
- <profile namespace="globus" key="nodeGranularity">1</profile>
- <profile namespace="globus" key="maxNodes">1</profile>
- <profile namespace="globus" key="project">TG-MCA94P017</profile>
- <profile namespace="karajan" key="jobThrottle">.3199</profile>
- <profile namespace="karajan" key="initialScore">10000</profile>
- <workdirectory>/scratch/01503/{env.USER}/work</workdirectory>
- </pool>
-
- <pool handle="stampede-ssh">
- <execution provider="coaster" jobmanager="ssh-cl:slurm" url="stampede.tacc.utexas.edu"/>
+ <execution provider="coaster" jobmanager="local:slurm"/>
<filesystem provider="local"/>
<profile namespace="globus" key="jobsPerNode">16</profile>
<profile namespace="globus" key="ppn">16</profile>
@@ -27,8 +13,29 @@
<profile namespace="globus" key="project">TG-MCA94P017</profile>
<profile namespace="karajan" key="jobThrottle">2</profile>
<profile namespace="karajan" key="initialScore">10000</profile>
- <workdirectory>/scratch/01503/{env.USER}/work</workdirectory>
+ <workdirectory>{env.SCRATCH}</workdirectory>
</pool>
+</config>
+
+<!--
+<config>
+ <pool handle="stampede">
+ <execution provider="coaster" jobmanager="gt2:gt2:slurm" url="login5.stampede.tacc.utexas.edu:2119/jobmanager-slurm"/>
+ <filesystem provider="gsiftp" url="gsiftp://gridftp.stampede.tacc.utexas.edu:2811"/>
+ <profile namespace="globus" key="jobsPerNode">16</profile>
+ <profile namespace="globus" key="ppn">16</profile>
+ <profile namespace="globus" key="maxTime">3600</profile>
+ <profile namespace="globus" key="maxwalltime">00:05:00</profile>
+ <profile namespace="globus" key="lowOverallocation">100</profile>
+ <profile namespace="globus" key="highOverallocation">100</profile>
+ <profile namespace="globus" key="queue">normal</profile>
+ <profile namespace="globus" key="nodeGranularity">1</profile>
+ <profile namespace="globus" key="maxNodes">1</profile>
+ <profile namespace="globus" key="project">TG-EAR130015</profile>
+ <profile namespace="karajan" key="jobThrottle">.3199</profile>
+ <profile namespace="karajan" key="initialScore">10000</profile>
+ <workdirectory>/scratch/01739/ketan/swift.work</workdirectory>
+ </pool>
</config>
-
+-->
\ No newline at end of file
Modified: branches/release-0.94/tests/sites/uc3/sites.template.xml
===================================================================
--- branches/release-0.94/tests/sites/uc3/sites.template.xml 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/sites/uc3/sites.template.xml 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,6 @@
-<config>
+<?xml version="1.0" encoding="UTF-8"?>
+<config xmlns="http://www.ci.uchicago.edu/swift/SwiftSites">
+
<pool handle="uc3">
<execution provider="coaster" url="uc3-sub.uchicago.edu" jobmanager="ssh-cl:condor"/>
<profile namespace="karajan" key="jobThrottle">10.00</profile>
@@ -8,7 +10,7 @@
<profile namespace="globus" key="maxWalltime">00:30:00</profile>
<profile namespace="globus" key="highOverAllocation">100</profile>
<profile namespace="globus" key="lowOverAllocation">100</profile>
- <profile namespace="globus" key="slots">1000</profile>
+ <profile namespace="globus" key="slots">1</profile>
<profile namespace="globus" key="maxNodes">1</profile>
<profile namespace="globus" key="nodeGranularity">1</profile>
<profile namespace="globus" key="jobType">nonshared</profile>
Modified: branches/release-0.94/tests/stress/IO/bagOnodes/sites.template.xml
===================================================================
--- branches/release-0.94/tests/stress/IO/bagOnodes/sites.template.xml 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/stress/IO/bagOnodes/sites.template.xml 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,5 @@
-<config>
+<?xml version="1.0" encoding="UTF-8"?>
+<config xmlns="http://www.ci.uchicago.edu/swift/SwiftSites">
<pool handle="crank">
<execution provider="coaster" jobmanager="ssh-cl:local" url="crank.mcs.anl.gov"/>
Modified: branches/release-0.94/tests/stress/IO/beagle/sites.template.xml
===================================================================
--- branches/release-0.94/tests/stress/IO/beagle/sites.template.xml 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/stress/IO/beagle/sites.template.xml 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,5 @@
-<config>
+<?xml version="1.0" encoding="UTF-8"?>
+<config xmlns="http://www.ci.uchicago.edu/swift/SwiftSites">
<pool handle="beagle">
<execution provider="coaster" jobmanager="ssh-cl:pbs" url="login4.beagle.ci.uchicago.edu"/>
<profile namespace="globus" key="jobsPerNode">24</profile>
@@ -6,10 +7,11 @@
<profile namespace="globus" key="highOverAllocation">100</profile>
<profile namespace="globus" key="providerAttributes">pbs.aprun;pbs.mpp;depth=24</profile>
<profile namespace="globus" key="maxtime">3700</profile>
- <profile namespace="globus" key="maxWalltime">01:00:00</profile>
+ <profile namespace="globus" key="maxWalltime">00:25:00</profile>
+ <!-- <profile namespace="globus" key="queue">development</profile> -->
<profile namespace="globus" key="userHomeOverride">/lustre/beagle/{env.USER}/swiftwork</profile>
- <profile namespace="globus" key="slots">20</profile>
- <profile namespace="globus" key="maxnodes">10</profile>
+ <profile namespace="globus" key="slots">2</profile>
+ <profile namespace="globus" key="maxnodes">4</profile>
<profile namespace="globus" key="nodeGranularity">1</profile>
<profile namespace="karajan" key="jobThrottle">4.80</profile>
<profile namespace="karajan" key="initialScore">10000</profile>
@@ -17,4 +19,4 @@
<!-- <workdirectory>/lustre/beagle/yadunandb/swiftwork</workdirectory> -->
<workdirectory>/tmp/{env.USER}/swiftwork</workdirectory>
</pool>
-</config>
\ No newline at end of file
+</config>
Modified: branches/release-0.94/tests/stress/IO/multiple/sites.template.xml
===================================================================
--- branches/release-0.94/tests/stress/IO/multiple/sites.template.xml 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/stress/IO/multiple/sites.template.xml 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,5 +1,5 @@
-<config>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<config xmlns="http://www.ci.uchicago.edu/swift/SwiftSites">
<pool handle="uc3">
<execution provider="coaster" url="uc3-sub.uchicago.edu" jobmanager="ssh-cl:condor"/>
<profile namespace="karajan" key="jobThrottle">10.00</profile>
@@ -24,7 +24,6 @@
<profile namespace="globus" key="lowOverAllocation">100</profile>
<profile namespace="globus" key="highOverAllocation">100</profile>
<!-- <profile namespace="globus" key="providerAttributes">pbs.aprun;pbs.mpp;depth=24</profile> -->
- <profile namespace="globus" key="providerAttributes">pbs.aprun;pbs.mpp;depth=24;pbs.resource_list=advres=wilde.1768</profile>
<profile namespace="globus" key="maxtime">3600</profile>
<profile namespace="globus" key="maxWalltime">00:05:00</profile>
<profile namespace="globus" key="userHomeOverride">/lustre/beagle/{beagle.USER}/swiftwork</profile>
Modified: branches/release-0.94/tests/stress/IO/uc3/sites.template.xml
===================================================================
--- branches/release-0.94/tests/stress/IO/uc3/sites.template.xml 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/stress/IO/uc3/sites.template.xml 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,17 +1,20 @@
-<config>
+<?xml version="1.0" encoding="UTF-8"?>
+<config xmlns="http://www.ci.uchicago.edu/swift/SwiftSites">
+
<pool handle="uc3">
<execution provider="coaster" url="uc3-sub.uchicago.edu" jobmanager="ssh-cl:condor"/>
<profile namespace="karajan" key="jobThrottle">10.00</profile>
<profile namespace="karajan" key="initialScore">10000</profile>
<profile namespace="globus" key="jobsPerNode">1</profile>
<profile namespace="globus" key="maxtime">3600</profile>
- <profile namespace="globus" key="maxWalltime">00:30:00</profile>
+ <profile namespace="globus" key="maxWalltime">00:10:00</profile>
<profile namespace="globus" key="highOverAllocation">100</profile>
<profile namespace="globus" key="lowOverAllocation">100</profile>
- <profile namespace="globus" key="slots">1000</profile>
+ <profile namespace="globus" key="slots">2</profile>
<profile namespace="globus" key="maxNodes">1</profile>
<profile namespace="globus" key="nodeGranularity">1</profile>
<profile namespace="globus" key="jobType">nonshared</profile>
<workdirectory>.</workdirectory>
</pool>
-</config>
\ No newline at end of file
+
+</config>
Modified: branches/release-0.94/tests/stress/apps/modis_beagle/modis.timeout
===================================================================
--- branches/release-0.94/tests/stress/apps/modis_beagle/modis.timeout 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/stress/apps/modis_beagle/modis.timeout 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1 +1 @@
-999999
+600
Modified: branches/release-0.94/tests/stress/apps/modis_beagle/sites.template.xml
===================================================================
--- branches/release-0.94/tests/stress/apps/modis_beagle/sites.template.xml 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/stress/apps/modis_beagle/sites.template.xml 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,6 @@
-<config>
+<?xml version="1.0" encoding="UTF-8"?>
+<config xmlns="http://www.ci.uchicago.edu/swift/SwiftSites">
+
<pool handle="beagle">
<execution provider="coaster" jobmanager="ssh-cl:pbs" url="login4.beagle.ci.uchicago.edu"/>
<profile namespace="globus" key="jobsPerNode">24</profile>
@@ -8,11 +10,11 @@
<profile namespace="globus" key="maxtime">3600</profile>
<profile namespace="globus" key="maxWalltime">00:05:00</profile>
<profile namespace="globus" key="userHomeOverride">/lustre/beagle/{env.USER}/swiftwork</profile>
- <profile namespace="globus" key="slots">20</profile>
+ <profile namespace="globus" key="slots">2</profile>
<profile namespace="globus" key="maxnodes">1</profile>
<profile namespace="globus" key="nodeGranularity">1</profile>
<profile namespace="karajan" key="jobThrottle">4.80</profile>
<profile namespace="karajan" key="initialScore">10000</profile>
<workdirectory>/tmp/{env.USER}/swiftwork</workdirectory>
</pool>
-</config>
\ No newline at end of file
+</config>
Modified: branches/release-0.94/tests/stress/apps/modis_local/modis.timeout
===================================================================
--- branches/release-0.94/tests/stress/apps/modis_local/modis.timeout 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/stress/apps/modis_local/modis.timeout 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1 +1 @@
-999999
+600
Modified: branches/release-0.94/tests/stress/apps/modis_local/sites.template.xml
===================================================================
--- branches/release-0.94/tests/stress/apps/modis_local/sites.template.xml 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/stress/apps/modis_local/sites.template.xml 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,5 @@
-<config>
+<?xml version="1.0" encoding="UTF-8"?>
+<config xmlns="http://www.ci.uchicago.edu/swift/SwiftSites">
<pool handle="local">
<execution provider="coaster" jobmanager="local:local"/>
<profile namespace="globus" key="jobsPerNode">4</profile>
Modified: branches/release-0.94/tests/stress/apps/modis_midway/modis.timeout
===================================================================
--- branches/release-0.94/tests/stress/apps/modis_midway/modis.timeout 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/stress/apps/modis_midway/modis.timeout 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1 +1 @@
-999999
+600
Modified: branches/release-0.94/tests/stress/apps/modis_midway/sites.template.xml
===================================================================
--- branches/release-0.94/tests/stress/apps/modis_midway/sites.template.xml 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/stress/apps/modis_midway/sites.template.xml 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,13 +1,15 @@
-<config>
+<?xml version="1.0" encoding="UTF-8"?>
+<config xmlns="http://www.ci.uchicago.edu/swift/SwiftSites">
+
<pool handle="midway">
<execution provider="coaster" jobmanager="local:slurm"/>
- <profile namespace="globus" key="queue">sandyb</profile>
+ <profile namespace="globus" key="queue">westmere</profile>
<profile namespace="globus" key="jobsPerNode">16</profile>
<profile namespace="globus" key="maxWalltime">00:05:00</profile>
<profile namespace="globus" key="maxTime">3600</profile>
<profile namespace="globus" key="highOverAllocation">100</profile>
<profile namespace="globus" key="lowOverAllocation">100</profile>
- <profile namespace="globus" key="slots">4</profile>
+ <profile namespace="globus" key="slots">2</profile>
<profile namespace="globus" key="maxNodes">1</profile>
<profile namespace="globus" key="nodeGranularity">1</profile>
<profile namespace="karajan" key="jobThrottle">.64</profile>
Modified: branches/release-0.94/tests/stress/apps/modis_multiple/modis.timeout
===================================================================
--- branches/release-0.94/tests/stress/apps/modis_multiple/modis.timeout 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/stress/apps/modis_multiple/modis.timeout 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1 +1 @@
-999999
+600
Modified: branches/release-0.94/tests/stress/apps/modis_multiple/sites.template.xml
===================================================================
--- branches/release-0.94/tests/stress/apps/modis_multiple/sites.template.xml 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/stress/apps/modis_multiple/sites.template.xml 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,4 +1,5 @@
-<config>
+<?xml version="1.0" encoding="UTF-8"?>
+<config xmlns="http://www.ci.uchicago.edu/swift/SwiftSites">
<pool handle="uc3">
<execution provider="coaster" url="uc3-sub.uchicago.edu" jobmanager="ssh-cl:condor"/>
@@ -6,10 +7,10 @@
<profile namespace="karajan" key="initialScore">10000</profile>
<profile namespace="globus" key="jobsPerNode">1</profile>
<profile namespace="globus" key="maxtime">3600</profile>
- <profile namespace="globus" key="maxWalltime">00:05:00</profile>
+ <profile namespace="globus" key="maxWalltime">00:10:00</profile>
<profile namespace="globus" key="highOverAllocation">100</profile>
<profile namespace="globus" key="lowOverAllocation">100</profile>
- <profile namespace="globus" key="slots">1000</profile>
+ <profile namespace="globus" key="slots">1</profile>
<profile namespace="globus" key="maxNodes">1</profile>
<profile namespace="globus" key="nodeGranularity">1</profile>
<profile namespace="globus" key="condor.+AccountingGroup">"group_friends.{uc3.USER}"</profile>
@@ -26,9 +27,9 @@
<!-- <profile namespace="globus" key="providerAttributes">pbs.aprun;pbs.mpp;depth=24</profile> -->
<profile namespace="globus" key="providerAttributes">pbs.aprun;pbs.mpp;depth=24;pbs.resource_list=advres=wilde.1768</profile>
<profile namespace="globus" key="maxtime">3600</profile>
- <profile namespace="globus" key="maxWalltime">00:05:00</profile>
+ <profile namespace="globus" key="maxWalltime">00:10:00</profile>
<profile namespace="globus" key="userHomeOverride">/lustre/beagle/{beagle.USER}/swiftwork</profile>
- <profile namespace="globus" key="slots">5</profile>
+ <profile namespace="globus" key="slots">1</profile>
<profile namespace="globus" key="maxnodes">1</profile>
<profile namespace="globus" key="nodeGranularity">1</profile>
<profile namespace="karajan" key="jobThrottle">4.80</profile>
@@ -40,11 +41,11 @@
<execution provider="coaster" jobmanager="local:slurm"/>
<profile namespace="globus" key="queue">sandyb</profile>
<profile namespace="globus" key="jobsPerNode">16</profile>
- <profile namespace="globus" key="maxWalltime">00:05:00</profile>
+ <profile namespace="globus" key="maxWalltime">00:10:00</profile>
<profile namespace="globus" key="maxTime">3600</profile>
<profile namespace="globus" key="highOverAllocation">100</profile>
<profile namespace="globus" key="lowOverAllocation">100</profile>
- <profile namespace="globus" key="slots">4</profile>
+ <profile namespace="globus" key="slots">1</profile>
<profile namespace="globus" key="maxNodes">1</profile>
<profile namespace="globus" key="nodeGranularity">1</profile>
<profile namespace="karajan" key="jobThrottle">.64</profile>
@@ -60,7 +61,7 @@
<profile namespace="globus" key="maxTime">3600</profile>
<profile namespace="globus" key="highOverAllocation">100</profile>
<profile namespace="globus" key="lowOverAllocation">100</profile>
- <profile namespace="globus" key="slots">4</profile>
+ <profile namespace="globus" key="slots">1</profile>
<profile namespace="globus" key="maxNodes">1</profile>
<profile namespace="globus" key="nodeGranularity">1</profile>
<profile namespace="karajan" key="jobThrottle">.48</profile>
Modified: branches/release-0.94/tests/stress/apps/modis_uc3/modis.timeout
===================================================================
--- branches/release-0.94/tests/stress/apps/modis_uc3/modis.timeout 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/stress/apps/modis_uc3/modis.timeout 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1 +1 @@
-999999
+600
Modified: branches/release-0.94/tests/stress/apps/modis_uc3/sites.template.xml
===================================================================
--- branches/release-0.94/tests/stress/apps/modis_uc3/sites.template.xml 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/stress/apps/modis_uc3/sites.template.xml 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,14 +1,16 @@
-<config>
+<?xml version="1.0" encoding="UTF-8"?>
+<config xmlns="http://www.ci.uchicago.edu/swift/SwiftSites">
+
<pool handle="uc3">
<execution provider="coaster" url="uc3-sub.uchicago.edu" jobmanager="ssh-cl:condor"/>
<profile namespace="karajan" key="jobThrottle">10.00</profile>
<profile namespace="karajan" key="initialScore">10000</profile>
<profile namespace="globus" key="jobsPerNode">1</profile>
<profile namespace="globus" key="maxtime">3600</profile>
- <profile namespace="globus" key="maxWalltime">00:05:00</profile>
+ <profile namespace="globus" key="maxWalltime">00:10:00</profile>
<profile namespace="globus" key="highOverAllocation">100</profile>
<profile namespace="globus" key="lowOverAllocation">100</profile>
- <profile namespace="globus" key="slots">1000</profile>
+ <profile namespace="globus" key="slots">1</profile>
<profile namespace="globus" key="maxNodes">1</profile>
<profile namespace="globus" key="nodeGranularity">1</profile>
<profile namespace="globus" key="condor.+AccountingGroup">"group_friends.{env.USER}"</profile>
Modified: branches/release-0.94/tests/stress/internals/swift.properties
===================================================================
--- branches/release-0.94/tests/stress/internals/swift.properties 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/stress/internals/swift.properties 2014-03-10 17:09:55 UTC (rev 7675)
@@ -5,3 +5,4 @@
status.mode=provider
use.provider.staging=false
provider.staging.pin.swiftfiles=false
+use.wrapper.staging=false
\ No newline at end of file
Modified: branches/release-0.94/tests/stress/internals/tc.template.data
===================================================================
--- branches/release-0.94/tests/stress/internals/tc.template.data 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/stress/internals/tc.template.data 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,2 +1,2 @@
local bash /bin/bash null null null
-
+local sleep /bin/sleep null null null
Modified: branches/release-0.94/tests/stress/internals/x_foreach.swift
===================================================================
--- branches/release-0.94/tests/stress/internals/x_foreach.swift 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/stress/internals/x_foreach.swift 2014-03-10 17:09:55 UTC (rev 7675)
@@ -2,16 +2,16 @@
Foreach loops with variable number of loops
to be called with cmdline arg -loops=<Number>
-#NIGHTLY 10000 100000
+#NIGHTLY 10000 100000
#WEEKLY 1000 10000 1000000
*/
-int limit = @toint(@arg("loops"));
+int limit = @toint(@arg("loops"));
int result[];
-foreach num, index in [1:limit:1] {
+foreach num, index in [0:limit-1:1] {
result[index] = index;
}
tracef("Result[0] = %i \n", result[0]);
-tracef("Result[%i] = %i \n", limit, result[limit]);
\ No newline at end of file
+tracef("Result[%i] = %i \n", limit, result[limit-1]);
Modified: branches/release-0.94/tests/stress/internals/x_recursion.args
===================================================================
--- branches/release-0.94/tests/stress/internals/x_recursion.args 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/stress/internals/x_recursion.args 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1 +1 @@
--loops=10000
+-loops=1000
Modified: branches/release-0.94/tests/stress/random_fail/sites.template.xml
===================================================================
--- branches/release-0.94/tests/stress/random_fail/sites.template.xml 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/stress/random_fail/sites.template.xml 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,16 +1,20 @@
-<config>
- <pool handle="local">
+<?xml version="1.0" encoding="UTF-8"?>
+<config xmlns="http://www.ci.uchicago.edu/swift/SwiftSites">
+
+ <pool handle="midway">
<execution provider="coaster" jobmanager="local:local"/>
- <profile namespace="globus" key="jobsPerNode">4</profile>
- <profile namespace="globus" key="maxWalltime">00:05:00</profile>
+ <profile namespace="globus" key="queue">sandyb</profile>
+ <profile namespace="globus" key="jobsPerNode">16</profile>
+ <profile namespace="globus" key="maxtime">36000</profile>
+ <profile namespace="globus" key="maxWalltime">00:10:00</profile>
<profile namespace="globus" key="highOverAllocation">100</profile>
<profile namespace="globus" key="lowOverAllocation">100</profile>
- <profile namespace="globus" key="slots">1</profile>
+ <profile namespace="globus" key="slots">4</profile>
<profile namespace="globus" key="maxNodes">1</profile>
<profile namespace="globus" key="nodeGranularity">1</profile>
- <profile namespace="karajan" key="jobThrottle">0.03</profile>
+ <profile namespace="karajan" key="jobThrottle">.64</profile>
<profile namespace="karajan" key="initialScore">10000</profile>
- <filesystem provider="local"/>
- <workdirectory>/scratch/midway/{env.USER}</workdirectory>
+ <workdirectory>/tmp/MIDWAY_USERNAME</workdirectory>
</pool>
+
</config>
Modified: branches/release-0.94/tests/stress/user_profile/user.source.sh
===================================================================
--- branches/release-0.94/tests/stress/user_profile/user.source.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/stress/user_profile/user.source.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -4,10 +4,4 @@
export BEAGLE_USERNAME="yadunandb"
export MIDWAY_USERNAME="yadunand"
export MCS_USERNAME="yadunand"
-export UC3_USERNAME="yadunand"
-
-if [ "$HOSTNAME" == "midway001" ]
-then
- export GLOBUS_HOSTNAME=swift.rcc.uchicago.edu
- export GLOBUS_TCP_PORT_RANGE=50000,51000
-fi;
\ No newline at end of file
+export UC3_USERNAME="yadunand"
\ No newline at end of file
Modified: branches/release-0.94/tests/user_env.sh
===================================================================
--- branches/release-0.94/tests/user_env.sh 2014-03-10 15:41:54 UTC (rev 7674)
+++ branches/release-0.94/tests/user_env.sh 2014-03-10 17:09:55 UTC (rev 7675)
@@ -1,13 +1,20 @@
export BEAGLE_USERNAME=""
-export BLUES_USERNAME=""
-export FUSION_USERNAME=""
+export MIDWAY_USERNAME=""
export MCS_USERNAME=""
-export MIDWAY_USERNAME=""
-export RAVEN_USERNAME=""
-export STAMPEDE_USERNAME=""
export UC3_USERNAME=""
+export FROM_MAIL="test_engine at midway001"
+export TO_MAIL=""
+export KILL_JAVA="true" #Set to true to kill dead java processes
-if [ $( hostname ) == "midway001" ]
+# FASTSETUP skips svn updates and rebuild to speed up multi_remote.setup.sh | Can be "true" or "false"
+export REMOTE_DRIVER_FASTSETUP="false"
+#export SWIFT_TAR_FILE="path/to/source/tarball/"
+
+# Determines the groups of tests run on the remote nodes | and future behavior
+# RUN_TYPE can be "daily", "weekly", "manual" (manual is undefined now)
+export RUN_TYPE="daily"
+
+if [ "$HOSTNAME" == "midway001" ]
then
export GLOBUS_HOSTNAME=swift.rcc.uchicago.edu
export GLOBUS_TCP_PORT_RANGE=50000,51000
Modified: tags/swift-0.94.1-RC3/tests/stress/local_cluster/sites.template.xml
===================================================================
--- tags/swift-0.94.1-RC3/tests/stress/local_cluster/sites.template.xml 2014-03-10 15:41:54 UTC (rev 7674)
+++ tags/swift-0.94.1-RC3/tests/stress/local_cluster/sites.template.xml 2014-03-10 17:09:55 UTC (rev 7675)
@@ -22,7 +22,7 @@
<profile namespace="globus" key="jobsPerNode">24</profile>
<profile namespace="globus" key="lowOverAllocation">100</profile>
<profile namespace="globus" key="highOverAllocation">100</profile>
- <profile namespace="globus" key="providerAttributes">pbs.aprun;pbs.mpp;depth=24;pbs.resource_list=advres=wilde.1768</profile>
+ <profile namespace="globus" key="providerAttributes"></profile>
<profile namespace="globus" key="maxtime">3600</profile>
<profile namespace="globus" key="maxWalltime">00:15:00</profile>
<profile namespace="globus" key="userHomeOverride">/lustre/beagle/{beagle.USER}/swiftwork</profile>
Modified: tags/swift-0.94.1-RC3/tests/stress/local_cluster/sites.xml
===================================================================
--- tags/swift-0.94.1-RC3/tests/stress/local_cluster/sites.xml 2014-03-10 15:41:54 UTC (rev 7674)
+++ tags/swift-0.94.1-RC3/tests/stress/local_cluster/sites.xml 2014-03-10 17:09:55 UTC (rev 7675)
@@ -9,7 +9,7 @@
<profile namespace="globus" key="maxWalltime">00:15:00</profile>
<profile namespace="globus" key="highOverAllocation">100</profile>
<profile namespace="globus" key="lowOverAllocation">100</profile>
- <profile namespace="globus" key="slots">1000</profile>
+ <profile namespace="globus" key="slots">4</profile>
<profile namespace="globus" key="maxNodes">1</profile>
<profile namespace="globus" key="nodeGranularity">1</profile>
<profile namespace="globus" key="condor.+AccountingGroup">"group_friends.yadunand"</profile>
@@ -22,14 +22,14 @@
<profile namespace="globus" key="jobsPerNode">24</profile>
<profile namespace="globus" key="lowOverAllocation">100</profile>
<profile namespace="globus" key="highOverAllocation">100</profile>
- <profile namespace="globus" key="providerAttributes">pbs.aprun;pbs.mpp;depth=24;pbs.resource_list=advres=wilde.1768</profile>
+ <profile namespace="globus" key="providerAttributes"></profile>
<profile namespace="globus" key="maxtime">3600</profile>
<profile namespace="globus" key="maxWalltime">00:15:00</profile>
<profile namespace="globus" key="userHomeOverride">/lustre/beagle/yadunandb/swiftwork</profile>
- <profile namespace="globus" key="slots">5</profile>
+ <profile namespace="globus" key="slots">4</profile>
<profile namespace="globus" key="maxnodes">1</profile>
<profile namespace="globus" key="nodeGranularity">1</profile>
- <profile namespace="karajan" key="jobThrottle">4.80</profile>
+ <profile namespace="karajan" key="jobThrottle">1.00</profile>
<profile namespace="karajan" key="initialScore">10000</profile>
<workdirectory>/tmp/yadunandb/swiftwork</workdirectory>
</pool>
More information about the Swift-commit
mailing list