Skip to content
Snippets Groups Projects
Commit ef3b977f authored by Morris Jette's avatar Morris Jette
Browse files

poe tests: run tests only if launch/poe configured rather than poe file existing

parent 934f9b9e
No related branches found
No related tags found
No related merge requests found
......@@ -1340,6 +1340,37 @@ proc test_switch_nrt { } {
return $switch_nrt
}
################################################################
#
# Proc: test_launch_poe
#
# Purpose: Determine if the system is using launch/poe.
#
# Returns 1 if the system is running launch/poe, 0 otherwise
#
################################################################
proc test_launch_poe { } {
global scontrol bin_bash bin_grep
log_user 0
set launch_poe 0
spawn -noecho $bin_bash -c "exec $scontrol show config | $bin_grep LaunchType"
expect {
"launch/poe" {
set launch_poe 1
exp_continue
}
eof {
wait
}
}
log_user 1
return $launch_poe
}
################################################################
#
# Proc: test_emulated
......
......@@ -46,13 +46,11 @@ set job_id 0
print_header $test_id
if { ![file exists $poe] } {
send_user "WARNING: poe must be installed on the\
system to run this test.\n"
if { ![test_launch_poe] } {
send_user "\nWARNING: This test is only compatable with launch/poe systems\n"
exit $exit_code
}
#
# execute poe with a specific node count
#
......
......@@ -46,13 +46,11 @@ set job_id 0
print_header $test_id
if { ![file exists $poe] } {
send_user "WARNING: poe must be installed on the\
system to run this test.\n"
if { ![test_launch_poe] } {
send_user "\nWARNING: This test is only compatable with launch/poe systems\n"
exit $exit_code
}
#
# execute poe with a specific node count
#
......
......@@ -43,9 +43,8 @@ set proto_count 0
set protos 0
print_header $test_id
if { ![file exists $poe] } {
send_user "WARNING: poe must be installed on the\
system to run this test.\n"
if { ![test_launch_poe] } {
send_user "\nWARNING: This test is only compatable with launch/poe systems\n"
exit $exit_code
}
......
......@@ -43,9 +43,8 @@ set job_count 5
set script "mpi-testscripts/script.slurm.sh"
print_header $test_id
if { ![file exists $poe] } {
send_user "WARNING: poe must be installed on the\
system to run this test.\n"
if { ![test_launch_poe] } {
send_user "\nWARNING: This test is only compatable with launch/poe systems\n"
exit $exit_code
}
if { ![file exists mpi-testscripts/allred] } {
......
......@@ -39,9 +39,8 @@ set job_id 0
print_header $test_id
if { ![file exists $poe] } {
send_user "WARNING: poe must be installed on the "
send_user "system to run this test.\n"
if { ![test_launch_poe] } {
send_user "\nWARNING: This test is only compatable with launch/poe systems\n"
exit $exit_code
}
if { ![test_super_user] != 0 } {
......
......@@ -48,9 +48,8 @@ print_header $test_id
exec $bin_rm -f $hostfile
if { ![file exists $poe] } {
send_user "WARNING: poe must be installed on the\
system to run this test.\n"
if { ![test_launch_poe] } {
send_user "\nWARNING: This test is only compatable with launch/poe systems\n"
exit $exit_code
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment