From 0fad90efb14565daeafb22a27103d8bebc6f975e Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Fri, 3 Nov 2017 09:00:02 -0600
Subject: [PATCH] Support "SchedulerParameters=disable_hetero_steps" in test
 suite

---
 testsuite/expect/globals   |  4 ++++
 testsuite/expect/test38.12 |  4 ++++
 testsuite/expect/test38.14 |  6 ++++++
 testsuite/expect/test38.15 |  4 ++++
 testsuite/expect/test38.16 |  4 ++++
 testsuite/expect/test38.6  |  4 ++++
 testsuite/expect/test38.7  |  4 ++++
 testsuite/expect/test38.9  | 13 +++++++++----
 8 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/testsuite/expect/globals b/testsuite/expect/globals
index 2cd5f8f0016..29f8cda0f91 100755
--- a/testsuite/expect/globals
+++ b/testsuite/expect/globals
@@ -4173,6 +4173,10 @@ proc test_pack_step { } {
 	} elseif {$version_major == 17 && $version_minor == 11} {
 		spawn $scontrol show config
 		expect {
+			-re "disable_hetero_steps" {
+				set pack_step 0
+				exp_continue
+			}
 			-re "enable_hetero_steps" {
 				set pack_step 1
 				exp_continue
diff --git a/testsuite/expect/test38.12 b/testsuite/expect/test38.12
index 84692915a3d..3772fd72233 100755
--- a/testsuite/expect/test38.12
+++ b/testsuite/expect/test38.12
@@ -41,6 +41,10 @@ if {[test_front_end]} {
         send_user "\nWARNING: This test is incompatible with front-end systems\n"
         exit $exit_code
 }
+if {[test_pack_step] == 0} {
+	send_user "\nWARNING: heterogeneous steps not currently supported\n"
+	exit $exit_code
+}
 
 set def_part_name [default_partition]
 set nb_nodes [get_node_cnt_in_part $def_part_name]
diff --git a/testsuite/expect/test38.14 b/testsuite/expect/test38.14
index 81735473a96..88bfb911ccc 100755
--- a/testsuite/expect/test38.14
+++ b/testsuite/expect/test38.14
@@ -37,6 +37,11 @@ set pack_job_id	0
 
 print_header $test_id
 
+if {[test_pack_step] == 0} {
+	send_user "\nWARNING: heterogeneous steps not currently supported\n"
+	exit $exit_code
+}
+
 set def_part_name [default_partition]
 set nb_nodes [get_node_cnt_in_part $def_part_name]
 if {$nb_nodes < 2} {
@@ -83,5 +88,6 @@ if {[wait_for_file $file_out] == 0} {
 
 if {$exit_code == 0} {
 	exec $bin_rm -f $file_out
+	send_user "\nSUCCESS\n"
 }
 exit $exit_code
diff --git a/testsuite/expect/test38.15 b/testsuite/expect/test38.15
index 2c262f5a2b5..008b5f3c0aa 100755
--- a/testsuite/expect/test38.15
+++ b/testsuite/expect/test38.15
@@ -41,6 +41,10 @@ if {[test_front_end]} {
         send_user "\nWARNING: This test is incompatible with front-end systems\n"
         exit $exit_code
 }
+if {[test_pack_step] == 0} {
+	send_user "\nWARNING: heterogeneous steps not currently supported\n"
+	exit $exit_code
+}
 
 set def_part_name [default_partition]
 set nb_nodes [get_node_cnt_in_part $def_part_name]
diff --git a/testsuite/expect/test38.16 b/testsuite/expect/test38.16
index 007d2102474..ecccbac63f6 100755
--- a/testsuite/expect/test38.16
+++ b/testsuite/expect/test38.16
@@ -42,6 +42,10 @@ if {[test_front_end]} {
         send_user "\nWARNING: This test is incompatible with front-end systems\n"
         exit $exit_code
 }
+if {[test_pack_step] == 0} {
+	send_user "\nWARNING: heterogeneous steps not currently supported\n"
+	exit $exit_code
+}
 
 set def_part_name [default_partition]
 set nb_nodes [get_node_cnt_in_part $def_part_name]
diff --git a/testsuite/expect/test38.6 b/testsuite/expect/test38.6
index 802c70771d6..73dea05f766 100755
--- a/testsuite/expect/test38.6
+++ b/testsuite/expect/test38.6
@@ -52,6 +52,10 @@ if {[test_front_end]} {
         send_user "\nWARNING: This test is incompatible with front-end systems\n"
         exit $exit_code
 }
+if {[test_pack_step] == 0} {
+	send_user "\nWARNING: heterogeneous steps not currently supported\n"
+	exit $exit_code
+}
 
 proc end_it { exit_code } {
 	global test_id orig_spank_conf spank_conf_file new_spank_conf spank_out
diff --git a/testsuite/expect/test38.7 b/testsuite/expect/test38.7
index 7d5de3851be..0a34e41f109 100755
--- a/testsuite/expect/test38.7
+++ b/testsuite/expect/test38.7
@@ -331,6 +331,10 @@ if {[wait_for_file $file_out] == 0} {
 # TEST OF PACK GROUP 0,1
 ########################################################################
 
+if {[test_pack_step] == 0} {
+	send_user "\nWARNING: heterogeneous steps not currently supported\n"
+	exit $exit_code
+}
 if {[test_pack_step] == 0} {
 	send_user "\nWARNING: heterogeneous steps not currently supported\n"
 	exit $exit_code
diff --git a/testsuite/expect/test38.9 b/testsuite/expect/test38.9
index 481fcfe65d5..db01456cab2 100755
--- a/testsuite/expect/test38.9
+++ b/testsuite/expect/test38.9
@@ -31,16 +31,21 @@
 source ./globals
 
 set test_id     "38.9"
+set exit_code	0
+set prompt	"PROMPT:"
 
 print_header $test_id
-set prompt           "PROMPT:"
-
-set timeout 60
 
 if {[test_front_end]} {
         send_user "\nWARNING: This test is incompatible with front-end systems\n"
         exit $exit_code
-} elseif {[test_serial]} {
+}
+if {[test_pack_step] == 0} {
+	send_user "\nWARNING: heterogeneous steps not currently supported\n"
+	exit $exit_code
+}
+
+if {[test_serial]} {
 	set task_num 1
 } else {
 	set task_num 2
-- 
GitLab