diff --git a/testsuite/expect/globals b/testsuite/expect/globals index 663ef48c0c7872d42dcda58e560e395d28b61a3c..89e87593ee393ffb4987ac1ecc3f863a6985badd 100755 --- a/testsuite/expect/globals +++ b/testsuite/expect/globals @@ -1930,6 +1930,37 @@ proc test_launch_type { } { return $type } +################################################################ +# +# Proc: test_launch_test_exec +# +# Purpose: Determine launch type plugin. +# +# Returns the launch plugin type +# +################################################################ + +proc test_launch_test_exec { } { + global scontrol bin_bash bin_grep alpha_numeric_under + + log_user 0 + set test_exec 0 + set type "" + spawn -noecho $bin_bash -c "exec $scontrol show config | $bin_grep LaunchParameters" + expect { + -re "test_exec" { + set test_exec 1 + exp_continue + } + eof { + wait + } + } + log_user 1 + + return $test_exec +} + ################################################################ # # Proc: test_node_features_plugin diff --git a/testsuite/expect/test1.10 b/testsuite/expect/test1.10 index 0b4d89828cd79e7797daa7ee5990d71cd8947be8..446eaff8166908013edcd63f67b48042bb56962c 100755 --- a/testsuite/expect/test1.10 +++ b/testsuite/expect/test1.10 @@ -40,13 +40,18 @@ set exit_code 0 print_header $test_id if {[test_alps]} { - send_user "\nWARNING: This test is incompatible with Cray systems\n" + send_user "\nWARNING: This test is incompatible with Cray/ALPS systems\n" exit $exit_code } elseif { [test_launch_poe] } { send_user "\nWARNING: This test is incompatible with launch/poe systems\n" exit $exit_code } +if {[test_launch_test_exec]} { + send_user "\nWARNING: This test is incompatible with LaunchParameters=test_exec\n" + exit $exit_code +} + # # Submit a slurm job that will bogus executable # Debug debug level is 2, value set with --debug has that offset