[Swift-commit] r8011 - in trunk/tests: . bugs cdm/ps cdm/ps/pinned documentation/tutorial functions language/should-not-work language/working language-behaviour/IO language-behaviour/arrays language-behaviour/broken language-behaviour/cleanup language-behaviour/compounds language-behaviour/control_structures language-behaviour/datatypes language-behaviour/logic language-behaviour/mappers language-behaviour/math language-behaviour/params language-behaviour/procedures language-behaviour/procedures/dynamic-output/provider-staging-coasters language-behaviour/procedures/dynamic-output/provider-staging-local language-behaviour/procedures/dynamic-output/swift-staging language-behaviour/strings language-behaviour/variables local mpi/beagle/long mpi/beagle/short mpi/crow/long mpi/crow/short mpi/fusion/long mpi/fusion/short mpi/local multi_remote sites/beagle sites/blues sites/bridled sites/ci sites/communicado sites/fusion sites/local sites/local-coasters sites/mac-frisbee sites/mcs sites/m idway sites/multiple_coaster_pools sites/osgconnect sites/raven sites/stampede sites/todo/crow sites/todo/fusion sites/todo/ibicluster sites/todo/intrepid sites/todo/surveyor sites/uc3 stress/IO/bagOnodes stress/IO/beagle stress/IO/multiple stress/IO/uc3 stress/apps/modis_beagle stress/apps/modis_midway stress/apps/modis_multiple stress/apps/modis_uc3 stress/long_runs stress/remote_sanity/beagle stress/remote_sanity/mac-frisbee stress/remote_sanity/mcs stress/remote_sanity/midway stress/remote_sanity/uc3
hategan at ci.uchicago.edu
hategan at ci.uchicago.edu
Sat Jul 12 15:36:22 CDT 2014
Author: hategan
Date: 2014-07-12 15:36:22 -0500 (Sat, 12 Jul 2014)
New Revision: 8011
Modified:
trunk/tests/bugs/swift.conf
trunk/tests/cdm/ps/pinned/swift.conf
trunk/tests/cdm/ps/swift.conf
trunk/tests/documentation/tutorial/swift.conf
trunk/tests/functions/swift.conf
trunk/tests/language-behaviour/IO/swift.conf
trunk/tests/language-behaviour/arrays/swift.conf
trunk/tests/language-behaviour/broken/swift.conf
trunk/tests/language-behaviour/cleanup/swift.conf
trunk/tests/language-behaviour/compounds/swift.conf
trunk/tests/language-behaviour/control_structures/swift.conf
trunk/tests/language-behaviour/datatypes/swift.conf
trunk/tests/language-behaviour/logic/swift.conf
trunk/tests/language-behaviour/mappers/swift.conf
trunk/tests/language-behaviour/math/swift.conf
trunk/tests/language-behaviour/params/swift.conf
trunk/tests/language-behaviour/procedures/dynamic-output/provider-staging-coasters/swift.conf
trunk/tests/language-behaviour/procedures/dynamic-output/provider-staging-local/swift.conf
trunk/tests/language-behaviour/procedures/dynamic-output/swift-staging/swift.conf
trunk/tests/language-behaviour/procedures/swift.conf
trunk/tests/language-behaviour/strings/swift.conf
trunk/tests/language-behaviour/variables/swift.conf
trunk/tests/language/should-not-work/swift.conf
trunk/tests/language/working/swift.conf
trunk/tests/local/swift.conf
trunk/tests/mpi/beagle/long/swift.conf
trunk/tests/mpi/beagle/short/swift.conf
trunk/tests/mpi/crow/long/swift.conf
trunk/tests/mpi/crow/short/swift.conf
trunk/tests/mpi/fusion/long/swift.conf
trunk/tests/mpi/fusion/short/swift.conf
trunk/tests/mpi/local/swift.conf
trunk/tests/multi_remote/swift.conf
trunk/tests/sites/beagle/swift.conf
trunk/tests/sites/blues/swift.conf
trunk/tests/sites/bridled/swift.conf
trunk/tests/sites/ci/swift.conf
trunk/tests/sites/communicado/swift.conf
trunk/tests/sites/fusion/swift.conf
trunk/tests/sites/local-coasters/swift.conf
trunk/tests/sites/local/swift.conf
trunk/tests/sites/mac-frisbee/swift.conf
trunk/tests/sites/mcs/swift.conf
trunk/tests/sites/midway/swift.conf
trunk/tests/sites/multiple_coaster_pools/swift.conf
trunk/tests/sites/osgconnect/swift.conf
trunk/tests/sites/raven/swift.conf
trunk/tests/sites/stampede/swift.conf
trunk/tests/sites/todo/crow/swift.conf
trunk/tests/sites/todo/fusion/swift.conf
trunk/tests/sites/todo/ibicluster/swift.conf
trunk/tests/sites/todo/intrepid/swift.conf
trunk/tests/sites/todo/surveyor/swift.conf
trunk/tests/sites/uc3/swift.conf
trunk/tests/stress/IO/bagOnodes/swift.conf
trunk/tests/stress/IO/beagle/swift.conf
trunk/tests/stress/IO/multiple/swift.conf
trunk/tests/stress/IO/uc3/swift.conf
trunk/tests/stress/apps/modis_beagle/swift.conf
trunk/tests/stress/apps/modis_midway/swift.conf
trunk/tests/stress/apps/modis_multiple/swift.conf
trunk/tests/stress/apps/modis_uc3/swift.conf
trunk/tests/stress/long_runs/swift.conf
trunk/tests/stress/remote_sanity/beagle/swift.conf
trunk/tests/stress/remote_sanity/mac-frisbee/swift.conf
trunk/tests/stress/remote_sanity/mcs/swift.conf
trunk/tests/stress/remote_sanity/midway/swift.conf
trunk/tests/stress/remote_sanity/uc3/swift.conf
trunk/tests/suite.sh
Log:
fixed site: [...] to sites: [...] and use -config option when launching swift if a test config is present
Modified: trunk/tests/bugs/swift.conf
===================================================================
--- trunk/tests/bugs/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/bugs/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -1,4 +1,4 @@
include "${swift.home}/etc/swift.conf"
-site: local
+sites: local
keepSiteDir: true
Modified: trunk/tests/cdm/ps/pinned/swift.conf
===================================================================
--- trunk/tests/cdm/ps/pinned/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/cdm/ps/pinned/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -68,6 +68,8 @@
}
+sites: [localhost, coasterslocal]
+
lazyErrors: false
executionRetries: 2
cachingAlgorithm: "LRU"
Modified: trunk/tests/cdm/ps/swift.conf
===================================================================
--- trunk/tests/cdm/ps/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/cdm/ps/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -68,6 +68,8 @@
}
+sites: [localhost, coasterslocal]
+
lazyErrors: false
executionRetries: 2
cachingAlgorithm: "LRU"
Modified: trunk/tests/documentation/tutorial/swift.conf
===================================================================
--- trunk/tests/documentation/tutorial/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/documentation/tutorial/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -1,4 +1,4 @@
include "${swift.home}/etc/swift.conf"
-site: local
+sites: local
keepSiteDir: true
Modified: trunk/tests/functions/swift.conf
===================================================================
--- trunk/tests/functions/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/functions/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -1,5 +1,5 @@
include "${swift.home}/etc/swift.conf"
-site: local
+sites: local
keepSiteDir: true
site.local.maxParallelTasks: 12
Modified: trunk/tests/language/should-not-work/swift.conf
===================================================================
--- trunk/tests/language/should-not-work/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/language/should-not-work/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -1,4 +1,4 @@
include "${swift.home}/etc/swift.conf"
-site: local
+sites: local
keepSiteDir: true
Modified: trunk/tests/language/working/swift.conf
===================================================================
--- trunk/tests/language/working/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/language/working/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -1,6 +1,6 @@
include "${swift.home}/etc/swift.conf"
-site: local
+sites: local
keepSiteDir: true
site.local {
Modified: trunk/tests/language-behaviour/IO/swift.conf
===================================================================
--- trunk/tests/language-behaviour/IO/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/language-behaviour/IO/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -1,4 +1,4 @@
include "${swift.home}/etc/swift.conf"
-site: local
+sites: local
keepSiteDir: true
Modified: trunk/tests/language-behaviour/arrays/swift.conf
===================================================================
--- trunk/tests/language-behaviour/arrays/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/language-behaviour/arrays/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -1,4 +1,4 @@
include "${swift.home}/etc/swift.conf"
-site: local
+sites: local
keepSiteDir: true
Modified: trunk/tests/language-behaviour/broken/swift.conf
===================================================================
--- trunk/tests/language-behaviour/broken/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/language-behaviour/broken/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -1,4 +1,4 @@
include "${swift.home}/etc/swift.conf"
-site: local
+sites: local
keepSiteDir: true
Modified: trunk/tests/language-behaviour/cleanup/swift.conf
===================================================================
--- trunk/tests/language-behaviour/cleanup/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/language-behaviour/cleanup/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -1,4 +1,4 @@
include "${swift.home}/etc/swift.conf"
-site: local
+sites: local
keepSiteDir: true
Modified: trunk/tests/language-behaviour/compounds/swift.conf
===================================================================
--- trunk/tests/language-behaviour/compounds/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/language-behaviour/compounds/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -1,4 +1,4 @@
include "${swift.home}/etc/swift.conf"
-site: local
+sites: local
keepSiteDir: true
Modified: trunk/tests/language-behaviour/control_structures/swift.conf
===================================================================
--- trunk/tests/language-behaviour/control_structures/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/language-behaviour/control_structures/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -1,4 +1,4 @@
include "${swift.home}/etc/swift.conf"
-site: local
+sites: local
keepSiteDir: true
Modified: trunk/tests/language-behaviour/datatypes/swift.conf
===================================================================
--- trunk/tests/language-behaviour/datatypes/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/language-behaviour/datatypes/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -1,4 +1,4 @@
include "${swift.home}/etc/swift.conf"
-site: local
+sites: local
keepSiteDir: true
Modified: trunk/tests/language-behaviour/logic/swift.conf
===================================================================
--- trunk/tests/language-behaviour/logic/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/language-behaviour/logic/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -1,4 +1,4 @@
include "${swift.home}/etc/swift.conf"
-site: local
+sites: local
keepSiteDir: true
Modified: trunk/tests/language-behaviour/mappers/swift.conf
===================================================================
--- trunk/tests/language-behaviour/mappers/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/language-behaviour/mappers/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -1,6 +1,6 @@
include "${swift.home}/etc/swift.conf"
-site: local
+sites: local
keepSiteDir: true
site.local {
Modified: trunk/tests/language-behaviour/math/swift.conf
===================================================================
--- trunk/tests/language-behaviour/math/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/language-behaviour/math/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -1,4 +1,4 @@
include "${swift.home}/etc/swift.conf"
-site: local
+sites: local
keepSiteDir: true
Modified: trunk/tests/language-behaviour/params/swift.conf
===================================================================
--- trunk/tests/language-behaviour/params/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/language-behaviour/params/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -1,4 +1,4 @@
include "${swift.home}/etc/swift.conf"
-site: local
+sites: local
keepSiteDir: true
Modified: trunk/tests/language-behaviour/procedures/dynamic-output/provider-staging-coasters/swift.conf
===================================================================
--- trunk/tests/language-behaviour/procedures/dynamic-output/provider-staging-coasters/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/language-behaviour/procedures/dynamic-output/provider-staging-coasters/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -20,6 +20,8 @@
initialParallelTasks: 255
}
+sites: localhost
+
lazyErrors: false
executionRetries: 2
cachingAlgorithm: "LRU"
Modified: trunk/tests/language-behaviour/procedures/dynamic-output/provider-staging-local/swift.conf
===================================================================
--- trunk/tests/language-behaviour/procedures/dynamic-output/provider-staging-local/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/language-behaviour/procedures/dynamic-output/provider-staging-local/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -13,6 +13,8 @@
OS: "INTEL32::LINUX"
}
+sites: localhost
+
lazyErrors: false
executionRetries: 2
cachingAlgorithm: "LRU"
Modified: trunk/tests/language-behaviour/procedures/dynamic-output/swift-staging/swift.conf
===================================================================
--- trunk/tests/language-behaviour/procedures/dynamic-output/swift-staging/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/language-behaviour/procedures/dynamic-output/swift-staging/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -13,6 +13,8 @@
OS: "INTEL32::LINUX"
}
+sites: localhost
+
lazyErrors: false
executionRetries: 2
cachingAlgorithm: "LRU"
Modified: trunk/tests/language-behaviour/procedures/swift.conf
===================================================================
--- trunk/tests/language-behaviour/procedures/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/language-behaviour/procedures/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -1,4 +1,10 @@
include "${swift.home}/etc/swift.conf"
-site: local
+sites: local
keepSiteDir: true
+
+site.local {
+ app.echo { executable: echo }
+ app.cat { executable: cat }
+ app.wc { executable: wc }
+}
Modified: trunk/tests/language-behaviour/strings/swift.conf
===================================================================
--- trunk/tests/language-behaviour/strings/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/language-behaviour/strings/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -1,4 +1,4 @@
include "${swift.home}/etc/swift.conf"
-site: local
+sites: local
keepSiteDir: true
Modified: trunk/tests/language-behaviour/variables/swift.conf
===================================================================
--- trunk/tests/language-behaviour/variables/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/language-behaviour/variables/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -1,4 +1,4 @@
include "${swift.home}/etc/swift.conf"
-site: local
+sites: local
keepSiteDir: true
Modified: trunk/tests/local/swift.conf
===================================================================
--- trunk/tests/local/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/local/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -1,6 +1,6 @@
include "${swift.home}/etc/swift.conf"
-site: local
+sites: local
keepSiteDir: true
site.local {
Modified: trunk/tests/mpi/beagle/long/swift.conf
===================================================================
--- trunk/tests/mpi/beagle/long/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/mpi/beagle/long/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -41,3 +41,4 @@
}
+sites: beagle
\ No newline at end of file
Modified: trunk/tests/mpi/beagle/short/swift.conf
===================================================================
--- trunk/tests/mpi/beagle/short/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/mpi/beagle/short/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -35,3 +35,4 @@
}
+sites: beagle
\ No newline at end of file
Modified: trunk/tests/mpi/crow/long/swift.conf
===================================================================
--- trunk/tests/mpi/crow/long/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/mpi/crow/long/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -41,3 +41,4 @@
}
+sites: crow
\ No newline at end of file
Modified: trunk/tests/mpi/crow/short/swift.conf
===================================================================
--- trunk/tests/mpi/crow/short/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/mpi/crow/short/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -35,3 +35,4 @@
}
+sites: crow
\ No newline at end of file
Modified: trunk/tests/mpi/fusion/long/swift.conf
===================================================================
--- trunk/tests/mpi/fusion/long/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/mpi/fusion/long/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -30,3 +30,4 @@
}
+sites: fusion
\ No newline at end of file
Modified: trunk/tests/mpi/fusion/short/swift.conf
===================================================================
--- trunk/tests/mpi/fusion/short/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/mpi/fusion/short/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -30,3 +30,4 @@
}
+sites: fusion
\ No newline at end of file
Modified: trunk/tests/mpi/local/swift.conf
===================================================================
--- trunk/tests/mpi/local/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/mpi/local/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -69,3 +69,4 @@
}
+sites: [localhost, coasterslocal]
\ No newline at end of file
Modified: trunk/tests/multi_remote/swift.conf
===================================================================
--- trunk/tests/multi_remote/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/multi_remote/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -296,6 +296,8 @@
}
+sites: [local, ci, beagle, blues, fusion, midway, uc3, mcs, frisbee, bridled, communicado]
+
TCPPortRange: "50000,51000"
lazyErrors: true
executionRetries: 0
Modified: trunk/tests/sites/beagle/swift.conf
===================================================================
--- trunk/tests/sites/beagle/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/sites/beagle/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -32,6 +32,8 @@
}
+sites: beagle
+
TCPPortRange: "50000,51000"
lazyErrors: false
executionRetries: 0
Modified: trunk/tests/sites/blues/swift.conf
===================================================================
--- trunk/tests/sites/blues/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/sites/blues/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -28,6 +28,8 @@
}
+sites: blues
+
TCPPortRange: "50000,51000"
lazyErrors: false
executionRetries: 0
Modified: trunk/tests/sites/bridled/swift.conf
===================================================================
--- trunk/tests/sites/bridled/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/sites/bridled/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -24,6 +24,8 @@
}
+sites: bridled
+
lazyErrors: false
executionRetries: 0
keepSiteDir: true
Modified: trunk/tests/sites/ci/swift.conf
===================================================================
--- trunk/tests/sites/ci/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/sites/ci/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -26,6 +26,8 @@
}
+sites: ci
+
TCPPortRange: "50000,51000"
lazyErrors: false
executionRetries: 0
Modified: trunk/tests/sites/communicado/swift.conf
===================================================================
--- trunk/tests/sites/communicado/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/sites/communicado/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -24,6 +24,8 @@
}
+sites: communicado
+
lazyErrors: false
executionRetries: 0
keepSiteDir: true
Modified: trunk/tests/sites/fusion/swift.conf
===================================================================
--- trunk/tests/sites/fusion/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/sites/fusion/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -27,6 +27,8 @@
}
+sites: fusion
+
TCPPortRange: "50000,51000"
lazyErrors: false
executionRetries: 0
Modified: trunk/tests/sites/local/swift.conf
===================================================================
--- trunk/tests/sites/local/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/sites/local/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -42,3 +42,4 @@
}
+sites: localhost
\ No newline at end of file
Modified: trunk/tests/sites/local-coasters/swift.conf
===================================================================
--- trunk/tests/sites/local-coasters/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/sites/local-coasters/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -64,3 +64,4 @@
}
+sites: [localhost, coasterslocal]
\ No newline at end of file
Modified: trunk/tests/sites/mac-frisbee/swift.conf
===================================================================
--- trunk/tests/sites/mac-frisbee/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/sites/mac-frisbee/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -23,6 +23,8 @@
}
+sites: frisbee
+
TCPPortRange: "50000,51000"
lazyErrors: false
executionRetries: 0
Modified: trunk/tests/sites/mcs/swift.conf
===================================================================
--- trunk/tests/sites/mcs/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/sites/mcs/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -24,6 +24,8 @@
}
+sites: crush
+
TCPPortRange: "50000,51000"
lazyErrors: false
executionRetries: 0
Modified: trunk/tests/sites/midway/swift.conf
===================================================================
--- trunk/tests/sites/midway/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/sites/midway/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -26,6 +26,8 @@
}
+sites: midway
+
TCPPortRange: "50000,51000"
lazyErrors: false
executionRetries: 0
Modified: trunk/tests/sites/multiple_coaster_pools/swift.conf
===================================================================
--- trunk/tests/sites/multiple_coaster_pools/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/sites/multiple_coaster_pools/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -56,3 +56,4 @@
}
+sites: [midway_single, midway_multiple]
\ No newline at end of file
Modified: trunk/tests/sites/osgconnect/swift.conf
===================================================================
--- trunk/tests/sites/osgconnect/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/sites/osgconnect/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -28,6 +28,8 @@
}
+sites: osgc
+
TCPPortRange: "50000,51000"
lazyErrors: false
executionRetries: 0
Modified: trunk/tests/sites/raven/swift.conf
===================================================================
--- trunk/tests/sites/raven/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/sites/raven/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -32,6 +32,8 @@
}
+sites: raven
+
TCPPortRange: "50000,51000"
lazyErrors: false
executionRetries: 0
Modified: trunk/tests/sites/stampede/swift.conf
===================================================================
--- trunk/tests/sites/stampede/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/sites/stampede/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -28,6 +28,8 @@
}
+sites: stampede
+
TCPPortRange: "50000,51000"
lazyErrors: false
executionRetries: 0
Modified: trunk/tests/sites/todo/crow/swift.conf
===================================================================
--- trunk/tests/sites/todo/crow/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/sites/todo/crow/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -64,3 +64,4 @@
}
+sites: crow
\ No newline at end of file
Modified: trunk/tests/sites/todo/fusion/swift.conf
===================================================================
--- trunk/tests/sites/todo/fusion/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/sites/todo/fusion/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -51,3 +51,4 @@
}
+sites: fusion
\ No newline at end of file
Modified: trunk/tests/sites/todo/ibicluster/swift.conf
===================================================================
--- trunk/tests/sites/todo/ibicluster/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/sites/todo/ibicluster/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -50,3 +50,4 @@
}
+sites: ibicluster
\ No newline at end of file
Modified: trunk/tests/sites/todo/intrepid/swift.conf
===================================================================
--- trunk/tests/sites/todo/intrepid/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/sites/todo/intrepid/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -45,3 +45,4 @@
}
+sites: [localhost, coasters_alcfbgp]
\ No newline at end of file
Modified: trunk/tests/sites/todo/surveyor/swift.conf
===================================================================
--- trunk/tests/sites/todo/surveyor/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/sites/todo/surveyor/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -56,3 +56,4 @@
}
+sites: surveyor
\ No newline at end of file
Modified: trunk/tests/sites/uc3/swift.conf
===================================================================
--- trunk/tests/sites/uc3/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/sites/uc3/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -27,6 +27,8 @@
}
+sites: uc3
+
TCPPortRange: "50000,51000"
lazyErrors: false
executionRetries: 0
Modified: trunk/tests/stress/IO/bagOnodes/swift.conf
===================================================================
--- trunk/tests/stress/IO/bagOnodes/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/stress/IO/bagOnodes/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -230,6 +230,8 @@
}
+sites: [crank, churn, crush, grind, steamroller, stomp, thrash, thwomp, trounce, vanquish]
+
TCPPortRange: "50000,51000"
lazyErrors: false
executionRetries: 0
Modified: trunk/tests/stress/IO/beagle/swift.conf
===================================================================
--- trunk/tests/stress/IO/beagle/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/stress/IO/beagle/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -32,6 +32,8 @@
}
+sites: beagle
+
TCPPortRange: "50000,51000"
lazyErrors: false
executionRetries: 0
Modified: trunk/tests/stress/IO/multiple/swift.conf
===================================================================
--- trunk/tests/stress/IO/multiple/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/stress/IO/multiple/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -94,6 +94,8 @@
initialParallelTasks: 48
}
+sites: [uc3, beagle, sandyb, westmere]
+
TCPPortRange: "50000,51000"
lazyErrors: false
executionRetries: 0
Modified: trunk/tests/stress/IO/uc3/swift.conf
===================================================================
--- trunk/tests/stress/IO/uc3/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/stress/IO/uc3/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -27,6 +27,8 @@
}
+sites: uc3
+
TCPPortRange: "50000,51000"
lazyErrors: false
executionRetries: 0
Modified: trunk/tests/stress/apps/modis_beagle/swift.conf
===================================================================
--- trunk/tests/stress/apps/modis_beagle/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/stress/apps/modis_beagle/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -32,6 +32,8 @@
}
+sites: beagle
+
lazyErrors: false
executionRetries: 0
keepSiteDir: true
Modified: trunk/tests/stress/apps/modis_midway/swift.conf
===================================================================
--- trunk/tests/stress/apps/modis_midway/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/stress/apps/modis_midway/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -27,6 +27,8 @@
}
+sites: midway
+
lazyErrors: false
executionRetries: 0
keepSiteDir: true
Modified: trunk/tests/stress/apps/modis_multiple/swift.conf
===================================================================
--- trunk/tests/stress/apps/modis_multiple/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/stress/apps/modis_multiple/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -110,6 +110,8 @@
}
+sites: [beagle, uc3, sandyb, westmere]
+
lazyErrors: false
executionRetries: 0
keepSiteDir: true
Modified: trunk/tests/stress/apps/modis_uc3/swift.conf
===================================================================
--- trunk/tests/stress/apps/modis_uc3/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/stress/apps/modis_uc3/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -28,6 +28,8 @@
}
+sites: uc3
+
lazyErrors: false
executionRetries: 0
keepSiteDir: true
Modified: trunk/tests/stress/long_runs/swift.conf
===================================================================
--- trunk/tests/stress/long_runs/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/stress/long_runs/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -32,6 +32,8 @@
}
+sites: beagle
+
TCPPortRange: "50000,51000"
lazyErrors: false
executionRetries: 0
Modified: trunk/tests/stress/remote_sanity/beagle/swift.conf
===================================================================
--- trunk/tests/stress/remote_sanity/beagle/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/stress/remote_sanity/beagle/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -32,6 +32,8 @@
}
+sites: beagle
+
TCPPortRange: "50000,51000"
lazyErrors: false
executionRetries: 0
Modified: trunk/tests/stress/remote_sanity/mac-frisbee/swift.conf
===================================================================
--- trunk/tests/stress/remote_sanity/mac-frisbee/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/stress/remote_sanity/mac-frisbee/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -23,6 +23,8 @@
}
+sites: frisbee
+
TCPPortRange: "50000,51000"
lazyErrors: false
executionRetries: 0
Modified: trunk/tests/stress/remote_sanity/mcs/swift.conf
===================================================================
--- trunk/tests/stress/remote_sanity/mcs/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/stress/remote_sanity/mcs/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -23,6 +23,8 @@
}
+sites: crush
+
TCPPortRange: "50000,51000"
lazyErrors: false
executionRetries: 0
Modified: trunk/tests/stress/remote_sanity/midway/swift.conf
===================================================================
--- trunk/tests/stress/remote_sanity/midway/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/stress/remote_sanity/midway/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -27,6 +27,8 @@
}
+sites: midway
+
TCPPortRange: "50000,51000"
lazyErrors: false
executionRetries: 0
Modified: trunk/tests/stress/remote_sanity/uc3/swift.conf
===================================================================
--- trunk/tests/stress/remote_sanity/uc3/swift.conf 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/stress/remote_sanity/uc3/swift.conf 2014-07-12 20:36:22 UTC (rev 8011)
@@ -27,6 +27,8 @@
}
+sites: uc3
+
TCPPortRange: "50000,51000"
lazyErrors: false
executionRetries: 0
Modified: trunk/tests/suite.sh
===================================================================
--- trunk/tests/suite.sh 2014-07-12 20:33:57 UTC (rev 8010)
+++ trunk/tests/suite.sh 2014-07-12 20:36:22 UTC (rev 8011)
@@ -561,7 +561,7 @@
PROG=$( echo $@ | sed 's/.*\( [^ ]*.swift\)/\1/' )
PROG=$( basename $PROG )
fi
-
+
echo -e "Executing: $PROG"
echo -e "\nExecuting: $@\n" >> $LOG
@@ -833,6 +833,12 @@
CDM=
[ -r fs.data ] && CDM="-cdm.file fs.data"
+
+ if [ "$HASCONF" == "1" ]; then
+ CONF="-config ./swift.conf"
+ else
+ CONF=
+ fi
(( TESTCOUNT++ ))
@@ -844,7 +850,7 @@
TEST_SHOULD_FAIL=$(( ! $? ))
OUTPUT=$NAME.stdout
- monitored_exec $TIMEOUT swift $CDM $SWIFTSCRIPT $ARGS
+ monitored_exec $TIMEOUT swift $CONF $CDM $SWIFTSCRIPT $ARGS
TEST_SHOULD_FAIL=0
if [ -x "$GROUP/$CHECKSCRIPT" ]; then
@@ -988,7 +994,10 @@
group_swift_properties() {
if [ -f $GROUP/swift.conf ]; then
cp -v $GROUP/swift.conf .
+ HASCONF=1
[ $? != 0 ] && crash "Could not copy swift.properties!"
+ else
+ HASCONF=0
fi
}
More information about the Swift-commit
mailing list