diff options
| author | cslocum <cslocum@d34015c8-bcbb-4646-8ac8-8ba5febf221d> | 2016-03-19 17:24:12 -0400 |
|---|---|---|
| committer | cslocum <cslocum@d34015c8-bcbb-4646-8ac8-8ba5febf221d> | 2016-03-19 17:24:12 -0400 |
| commit | 9b85f26e85094cc63472dbd645d7faee6ac0cfeb (patch) | |
| tree | 9bd7a28fa4f4d507d36feef7ce3da80826e6682d | |
| parent | d5533c4b6a934ced1642870d465d6a5efac71d4e (diff) | |
| download | steuermann-9b85f26e85094cc63472dbd645d7faee6ac0cfeb.tar.gz | |
update how pandeia client tests are run
git-svn-id: https://svn.stsci.edu/svn/ssb/etal/steuermann/trunk@1476 d34015c8-bcbb-4646-8ac8-8ba5febf221d
| -rw-r--r-- | sm/pandeia.sm | 16 | ||||
| -rw-r--r-- | sm/pandeia_midday.sm | 9 | ||||
| -rw-r--r-- | sm/pandeia_midday_branch_test.sm | 8 |
3 files changed, 21 insertions, 12 deletions
diff --git a/sm/pandeia.sm b/sm/pandeia.sm index 01dc0a8..c944e46 100644 --- a/sm/pandeia.sm +++ b/sm/pandeia.sm @@ -11,6 +11,11 @@ TABLE master_installation HOST dljwetcv3 AFTER *:master_installation/install_v4 +TABLE master_tests HOST bond + + CMD test_client RUN "/Users/Shared/pandeia/tests/go master" + AFTER *:master_tests/test_engine + TABLE master_tests HOST dljwetcv3 CMD test_server RUN "/etcdata/pandeia/master/run_tests -server" @@ -19,9 +24,6 @@ TABLE master_tests HOST dljwetcv3 CMD test_engine RUN "/etcdata/pandeia/master/run_tests -engine" AFTER *:master_tests/test_server - CMD test_client RUN "/etcdata/pandeia/master/run_tests -client" - AFTER *:master_tests/test_engine - CMD test_final RUN "/etcdata/pandeia/master/run_tests -final" AFTER *:master_tests/test_client @@ -37,6 +39,11 @@ TABLE branch_test_installation HOST dljwetcv3 AFTER *:branch_test_installation/install_v4 +TABLE branch_test_tests HOST bond + + CMD test_client RUN "/Users/Shared/pandeia/tests/go branch_test" + AFTER *:branch_test_tests/test_engine + TABLE branch_test_tests HOST dljwetcv3 CMD test_server RUN "/etcdata/pandeia/branch_test/run_tests -server" @@ -45,9 +52,6 @@ TABLE branch_test_tests HOST dljwetcv3 CMD test_engine RUN "/etcdata/pandeia/branch_test/run_tests -engine" AFTER *:branch_test_tests/test_server - CMD test_client RUN "/etcdata/pandeia/branch_test/run_tests -client" - AFTER *:branch_test_tests/test_engine - CMD test_final RUN "/etcdata/pandeia/branch_test/run_tests -final" AFTER *:branch_test_tests/test_client diff --git a/sm/pandeia_midday.sm b/sm/pandeia_midday.sm index 4d8f8b1..9725509 100644 --- a/sm/pandeia_midday.sm +++ b/sm/pandeia_midday.sm @@ -11,6 +11,12 @@ TABLE master_installation HOST dljwetcv3 AFTER *:master_installation/install_v4 +TABLE master_tests HOST bond + + CMD test_client RUN "/Users/Shared/pandeia/tests/go master" + AFTER OPT *:master_tests/test_engine + AFTER OPT *:master_tests/test_server + TABLE master_tests HOST dljwetcv3 CMD test_server RUN "/etcdata/pandeia/master/run_tests -server" @@ -19,9 +25,6 @@ TABLE master_tests HOST dljwetcv3 # CMD test_engine RUN "/etcdata/pandeia/master/run_tests -engine" # AFTER *:master_tests/test_server -# CMD test_client RUN "/etcdata/pandeia/master/run_tests -client" -# AFTER *:master_tests/test_engine - CMD test_final RUN "/etcdata/pandeia/master/run_tests -final" AFTER OPT *:master_tests/test_server AFTER OPT *:master_tests/test_engine diff --git a/sm/pandeia_midday_branch_test.sm b/sm/pandeia_midday_branch_test.sm index 86cb351..564149d 100644 --- a/sm/pandeia_midday_branch_test.sm +++ b/sm/pandeia_midday_branch_test.sm @@ -11,6 +11,11 @@ TABLE branch_test_installation HOST dljwetcv3 AFTER *:branch_test_installation/install_v4 +TABLE branch_test_tests HOST bond + + CMD test_client RUN "/Users/Shared/pandeia/tests/go branch_test" + AFTER *:branch_test_tests/test_engine + TABLE branch_test_tests HOST dljwetcv3 CMD test_server RUN "/etcdata/pandeia/branch_test/run_tests -server" @@ -19,9 +24,6 @@ TABLE branch_test_tests HOST dljwetcv3 CMD test_engine RUN "/etcdata/pandeia/branch_test/run_tests -engine" AFTER *:branch_test_tests/test_server - CMD test_client RUN "/etcdata/pandeia/branch_test/run_tests -client" - AFTER *:branch_test_tests/test_engine - CMD test_final RUN "/etcdata/pandeia/branch_test/run_tests -final" AFTER *:branch_test_tests/test_client |