BGQ test suite updates

Update test suite for BGQ emulation. Some command output has changed
slightly. srun command only launches one task (runjob) now.

testsuite/expect/test1.15

@@ -39,6 +39,10 @@ set matches     0
 
 print_header $test_id
 
+if {[test_bluegene]} {
+	send_user "\nWARNING: This test is incompatible with Bluegene systems\n"
+	exit $exit_code
+}
 if {[test_cray]} {
 	send_user "\nWARNING: This test is incompatible with Cray systems\n"
 	exit $exit_code

testsuite/expect/test1.2

@@ -35,12 +35,17 @@ source ./globals
 
 set test_id     "1.2"
 set exit_code   0
-set task_cnt    10
 set tasks       0
 
 print_header $test_id
 
 # if the srun --overcommit option worked this test would work.
+if {[test_bluegene]} {
+	# We never launch more than one task on emulated Bluegene
+	set task_cnt 1
+} else {
+	set task_cnt 10
+}
 if {[test_cray]} {
 	send_user "\nWARNING: This test is incompatible with Cray systems\n"
 	exit $exit_code

testsuite/expect/test1.21

@@ -45,6 +45,10 @@ if {[test_cray]} {
 	send_user "\nWARNING: This test is incompatible with Cray systems\n"
 	exit $exit_code
 }
+if {[test_bluegene]} {
+	send_user "\nWARNING: This test is incompatible with Bluegene systems\n"
+	exit $exit_code
+}
 
 #
 # Spawn a shell via srun with stdout forwarding disabled

testsuite/expect/test1.22

@@ -39,6 +39,10 @@ set exit_code   0
 
 print_header $test_id
 
+if {[test_bluegene]} {
+	send_user "\nWARNING: This test is incompatible with Bluegene systems\n"
+	exit $exit_code
+}
 if {[test_cray]} {
 	send_user "\nWARNING: This test is incompatible with Cray systems\n"
 	exit $exit_code

testsuite/expect/test1.33

@@ -39,6 +39,10 @@ set test_script    "./test$test_id.bash"
 
 print_header $test_id
 
+if {[test_bluegene]} {
+	send_user "\nWARNING: This test is incompatible with Bluegene systems\n"
+	exit $exit_code
+}
 if {[test_cray]} {
 	send_user "\nWARNING: This test is incompatible with Cray systems\n"
 	exit $exit_code

testsuite/expect/test1.46

@@ -39,6 +39,10 @@ set matches     0
 
 print_header $test_id
 
+if {[test_bluegene]} {
+	send_user "\nWARNING: This test is incompatible with Bluegene systems\n"
+	exit $exit_code
+}
 if {[test_cray]} {
 	send_user "\nWARNING: This test is incompatible with Cray systems\n"
 	exit $exit_code

testsuite/expect/test1.9

@@ -34,12 +34,17 @@ source ./globals
 
 set test_id     "1.9"
 set exit_code   0
-set task_cnt    5
 set tasks       0
 set verbosity   0
 
 print_header $test_id
 
+if {[test_bluegene]} {
+	# We never launch more than one task on emulated Bluegene
+	set task_cnt 1
+} else {
+	set task_cnt 5
+}
 if {[test_cray]} {
 	send_user "\nWARNING: This test is incompatible with Cray systems\n"
 	exit $exit_code

testsuite/expect/test10.12

@@ -54,7 +54,7 @@ if {[file exists $smap] == 0} {
 #
 spawn $smap --resolve 000
 expect {
-	-re "Must be physically on a BG" {
+	-re "Must be physically on a BlueGene" {
 		set non_bg 1
 		exp_continue;
 	}
@@ -72,7 +72,7 @@ expect {
 	}
 }
 if {$non_bg != 0} {
-	send_user "\nWARNING: This test is only valid on a Blue Gene system Service Node\n"
+	send_user "\nWARNING: This test is only valid on a BlueGene system Service Node\n"
 	exit 0
 }
 if {$check != 1} {

testsuite/expect/test17.6

@@ -37,11 +37,17 @@ set test_id     "17.6"
 set exit_code   0
 set file_in     "test$test_id.input"
 set file_out    "test$test_id.output"
-set task_cnt    2
 set tasks       0
 
 print_header $test_id
 
+if {[test_bluegene]} {
+	# We never launch more than one task on emulated Bluegene
+	set task_cnt    1
+} else {
+	set task_cnt    2
+}
+
 #
 # Submit a slurm job that will execute 'id' on $task_cnt tasks (or try anyway)
 #