Merge pull request #3977 from oliver-sanders/tests-batch-sys

tests: fix disabled batch sys tests
cylc · Dec 3, 2020 · 4af4f1e · 4af4f1e
2 parents cf9de28 + 6b25d54
commit 4af4f1e
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/tests/flakyfunctional/execution-time-limit/00-background.t b/tests/flakyfunctional/execution-time-limit/00-background.t
@@ -16,8 +16,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #-------------------------------------------------------------------------------
 # Test execution time limit, background/at job
-CYLC_TEST_BATCH_SYS=${TEST_NAME_BASE##??-}
-export REQUIRE_PLATFORM="batch:$CYLC_TEST_BATCH_SYS"
+BATCH_SYS="${0##*\/??-}"
+export REQUIRE_PLATFORM="batch:${BATCH_SYS%%.t}"
 . "$(dirname "$0")/test_header"
 set_test_number 4
 

diff --git a/tests/functional/cylc-poll/06-loadleveler.t b/tests/functional/cylc-poll/06-loadleveler.t
@@ -17,8 +17,8 @@
 #-------------------------------------------------------------------------------
 # Test "cylc poll" for loadleveler, slurm, or pbs jobs.
 # TODO Check this test on a dockerized system or VM.
-BATCH_SYS_NAME="$(sed 's/.*\/...\(.*\)\.t/\1/' <<< "$0")"
-export REQUIRE_PLATFORM="batch:$BATCH_SYS_NAME comms:tcp"
+BATCH_SYS="${0##*\/??-}"
+export REQUIRE_PLATFORM="batch:${BATCH_SYS%%.t} comms:tcp"
 . "$(dirname "$0")/test_header"
 #-------------------------------------------------------------------------------
 set_test_number 2

diff --git a/tests/functional/directives/00-loadleveler.t b/tests/functional/directives/00-loadleveler.t
@@ -19,8 +19,9 @@
 #     This test requires an e.g. [test battery][batch systems][loadleveler]host
 #     entry in site/user config in order to run 'loadleveler' tests (same for
 #     slurm, pbs, etc), otherwise it will be bypassed.
-BATCH_SYS_NAME="$(sed 's/.*\/...\(.*\)\.t/\1/' <<< "$0")"
-export REQUIRE_PLATFORM="batch:$BATCH_SYS_NAME comms:tcp"
+BATCH_SYS="${0##*\/??-}"
+BATCH_SYS_NAME="${BATCH_SYS%%.t}"
+export REQUIRE_PLATFORM="batch:${BATCH_SYS_NAME} comms:tcp"
 . "$(dirname "$0")/test_header"
 #-------------------------------------------------------------------------------
 set_test_number 2

diff --git a/tests/functional/execution-time-limit/02-slurm.t b/tests/functional/execution-time-limit/02-slurm.t
@@ -16,8 +16,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #-------------------------------------------------------------------------------
 # Test execution time limit setting, slurm job
-CYLC_TEST_BATCH_SYS="${TEST_NAME_BASE##??-}"
-export REQUIRE_PLATFORM="batch:$CYLC_TEST_BATCH_SYS"
+BATCH_SYS="${0##*\/??-}"
+export REQUIRE_PLATFORM="batch:${BATCH_SYS%%.t}"
 . "$(dirname "$0")/test_header"
 #-------------------------------------------------------------------------------
 set_test_number 3

diff --git a/tests/functional/execution-time-limit/03-pbs.t b/tests/functional/execution-time-limit/03-pbs.t
@@ -16,8 +16,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #-------------------------------------------------------------------------------
 # Test execution time limit setting, PBS job
-CYLC_TEST_BATCH_SYS="${TEST_NAME_BASE##??-}"
-export REQUIRE_PLATFORM="batch:$CYLC_TEST_BATCH_SYS"
+BATCH_SYS="${0##*\/??-}"
+export REQUIRE_PLATFORM="batch:${BATCH_SYS%%.t}"
 . "$(dirname "$0")/test_header"
 #-------------------------------------------------------------------------------
 set_test_number 3

diff --git a/tests/functional/job-kill/02-loadleveler.t b/tests/functional/job-kill/02-loadleveler.t
@@ -17,8 +17,8 @@
 #-------------------------------------------------------------------------------
 # Test killing of jobs submitted to loadleveler, slurm, pbs...
 # TODO Check this test on a dockerized system or VM.
-BATCH_SYS_NAME="$(sed 's/.*\/...\(.*\)\.t/\1/' <<< "$0")"
-export REQUIRE_PLATFORM="batch:$BATCH_SYS_NAME comms:tcp"
+BATCH_SYS="${0##*\/??-}"
+export REQUIRE_PLATFORM="batch:${BATCH_SYS%%.t} comms:tcp"
 . "$(dirname "$0")/test_header"
 #-------------------------------------------------------------------------------
 set_test_number 2