fix a number of problems with respect to cray systems.

testsuite/expect/test1.61

@@ -40,9 +40,13 @@ set file_out    "test$test_id.output"
 set file_err    "test$test_id.error"
 set timeout 60
 
-
 print_header $test_id
 
+if {[test_cray]} {
+	send_user "\nWARNING: This test is incompatible with Cray systems\n"
+	exit $exit_code
+}
+
 exec $bin_rm -f $file_in file_out file_err
 make_bash_script $file_in "
   $bin_date

testsuite/expect/test1.81

@@ -40,6 +40,11 @@ set exit_code   0
 
 print_header $test_id
 
+if {[test_cray]} {
+	send_user "\nWARNING: This test is incompatible with Cray systems\n"
+	exit $exit_code
+}
+
 #
 # Submit a 1 node job and validate that we don't get more than one
 #

testsuite/expect/test11.5

@@ -39,6 +39,11 @@ set job_id      0
 
 print_header $test_id
 
+if {[test_cray]} {
+	send_user "\nWARNING: This test is incompatible with Cray systems\n"
+	exit $exit_code
+}
+
 #
 # Delete left-over input script
 # Build input script file
@@ -85,7 +90,7 @@ if {[wait_for_step $job_id.0] != 0} {
 }
 
 #
-# Enable/disable/test ability to heckpoint
+# Enable/disable/test abFAILility to heckpoint
 #
 spawn $scontrol check disable $job_id.0
 expect {

testsuite/expect/test15.17

@@ -41,6 +41,11 @@ set job_id_2     0
 
 print_header $test_id
 
+if {[test_cray]} {
+	send_user "\nWARNING: This test is incompatible with Cray systems\n"
+	exit $exit_code
+}
+
 #
 # Build input script file
 #

testsuite/expect/test2.11

@@ -41,6 +41,11 @@ set scontrol_id 0
 
 print_header $test_id
 
+if {[test_cray]} {
+	send_user "\nWARNING: This test is incompatible with Cray systems\n"
+	exit $exit_code
+}
+
 # Delete left-over stdout file
 file delete $file_out
 

testsuite/expect/test2.13

@@ -41,11 +41,16 @@ set orig_time     0
 set new_time      0
 
 print_header $test_id
-exec $bin_rm -f $file_in $file_out
+
+if {[test_cray]} {
+	send_user "\nWARNING: This test is incompatible with Cray systems\n"
+	exit $exit_code
+}
 
 #
 # Build input script file
 #
+exec $bin_rm -f $file_in $file_out
 make_bash_script $file_in "
   $bin_echo TEST_BEGIN
   $srun -t5 $bin_sleep 120

testsuite/expect/test2.8

@@ -178,7 +178,7 @@ expect {
 		wait
 	}
 }
-if {$matches != 1} {
+if {[test_cray] == 0 && $matches != 1} {
 	send_user "\nFAILURE: scontrol failed to find all job steps\n"
 	set exit_code 1
 }
@@ -206,7 +206,7 @@ expect {
 		wait
 	}
 }
-if {$matches != 1} {
+if {[test_cray] == 0 && $matches != 1} {
 	send_user "\nFAILURE: scontrol failed to specific job step\n"
 	set exit_code 1
 }
@@ -242,7 +242,7 @@ expect {
 		wait
 	}
 }
-if {$matches != 1} {
+if {[test_cray] == 0 && $matches != 1} {
 	send_user "\nFAILURE: scontrol found unexpected job step\n"
 	set exit_code 1
 }

testsuite/expect/test3.9

@@ -37,6 +37,11 @@ set exit_code   0
 
 print_header $test_id
 
+if {[test_cray]} {
+	send_user "\nWARNING: This test is incompatible with Cray systems\n"
+	exit $exit_code
+}
+
 #
 # Issue scontrol reconfigure
 #

testsuite/expect/test5.4

@@ -229,7 +229,7 @@ expect {
 	}
 }
 
-if {$step_found == 0} {
+if {[test_cray] == 0 && $step_found == 0} {
 	send_user "\nFAILURE: squeue step format error\n"
 	set exit_code 1
 }

testsuite/expect/test5.6

@@ -336,7 +336,7 @@ expect {
 		wait
 	}
 }
-if {$job_found == 0} {
+if {[test_cray] == 0 && $job_found == 0} {
 	send_user "\nFAILURE: squeue failed to locate desired job step\n"
 	set exit_code 1
 }

testsuite/expect/test7.5

@@ -49,7 +49,10 @@ if { [test_xcpu] } {
 	send_user "\nWARNING: This test is incompatible with XCPU systems\n"
 	exit $exit_code
 }
-
+if {[test_cray]} {
+	send_user "\nWARNING: This test is incompatible with Cray systems\n"
+	exit $exit_code
+}
 
 #
 # Delete left-over program and rebuild it

testsuite/expect/test9.1

@@ -57,6 +57,11 @@ set other_opts   "-O"
 
 print_header $test_id
 
+if {[test_cray]} {
+	send_user "\nWARNING: This test is incompatible with Cray systems\n"
+	exit $exit_code
+}
+
 # Execute an srun job to cat input_file to output_file, wait for completion
 # Returns 0 on successful completion, returns 1 otherwise
 proc run_cat_job { input_file output_file } {

testsuite/expect/test9.2

@@ -55,6 +55,11 @@ set task_cnt     $max_stress_tasks
 
 print_header $test_id
 
+if {[test_cray]} {
+	send_user "\nWARNING: This test is incompatible with Cray systems\n"
+	exit $exit_code
+}
+
 # Execute an srun job to print hostname to output_file with task_cnt tasks per node,
 # wait for completion
 # Returns 0 on successful completion, returns 1 otherwise

testsuite/expect/test9.4

@@ -63,6 +63,11 @@ set task_cnt      $max_stress_tasks
 
 print_header $test_id
 
+if {[test_cray]} {
+	send_user "\nWARNING: This test is incompatible with Cray systems\n"
+	exit $exit_code
+}
+
 # Execute an srun job to print hostname to output_file with task_cnt tasks
 # per node, wait for completion
 # Returns 0 on successful completion, returns 1 otherwise

testsuite/expect/test9.5

@@ -54,6 +54,11 @@ set task_cnt      $max_stress_tasks
 
 print_header $test_id
 
+if {[test_cray]} {
+	send_user "\nWARNING: This test is incompatible with Cray systems\n"
+	exit $exit_code
+}
+
 # Execute an srun job to print hostname to output_file with task_cnt tasks
 # per node, wait for completion
 # Returns 0 on successful completion, returns 1 otherwise

testsuite/expect/test9.8

@@ -46,6 +46,11 @@ set task_cnt     60
 
 print_header $test_id
 
+if {[test_cray]} {
+	send_user "\nWARNING: This test is incompatible with Cray systems\n"
+	exit $exit_code
+}
+
 #
 # A single slurmd can't handle a large task count without
 # running out of memory and pthreads