Handle test for affinity more generically

testsuite/expect/globals

@@ -923,6 +923,43 @@ proc test_topology { } {
 	return $have_topology
 }
 
+################################################################
+#
+# Proc: test_affinity
+#
+# Purpose: Determine if system is enforcing affinity
+#
+# Returns 1 if enforcing, 0 if none
+#
+################################################################
+proc test_affinity { } {
+	global scontrol alpha
+
+	log_user 0
+	set affinity 0
+	spawn $scontrol show config
+	expect {
+		-re "TaskPlugin *= task/($alpha)" {
+			if {![string compare $expect_out(1,string) "affinity"] || ![string compare $expect_out(1,string) "cgroup"]} {
+				set affinity 1
+			}
+			exp_continue
+		}
+		-re "TaskPlugin *= ($alpha)" {
+			if {![string compare $expect_out(1,string) "affinity"] || ![string compare $expect_out(1,string) "cgroup"]} {
+				set affinity 1
+			}
+			exp_continue
+		}
+		eof {
+			wait
+		}
+	}
+
+	log_user 1
+	return $affinity
+}
+
 ################################################################
 #
 # Proc: test_track_wckey

testsuite/expect/test1.89

@@ -48,22 +48,7 @@ if {[test_serial]} {
 #
 # Test if task affinity support is supported.
 #
-set affinity 0
-log_user 0
-spawn $scontrol show config
-expect {
-	-re "TaskPlugin *= task/($alpha)" {
-		if {![string compare $expect_out(1,string) "affinity"] || ![string compare $expect_out(1,string) "cgroup"]} {
-			set affinity 1
-		}
-		exp_continue
-	}
-	eof {
-		wait
-	}
-}
-log_user 1
-if {$affinity == 0} {
+if {![test_affinity]} {
 	send_user "\nWARNING: task affinity not supported on this system\n"
 	exit 0
 }

testsuite/expect/test1.90

@@ -48,7 +48,7 @@ if { [test_launch_poe] } {
 #
 # Test if memory affinity support is supported.
 #
-set affinity 0
+set affinity [test_affinity]
 set fast_sched 0
 log_user 0
 spawn $scontrol show config
@@ -57,12 +57,6 @@ expect {
 		set fast_sched $expect_out(1,string)
 		exp_continue
 	}
-	-re "TaskPlugin *= task/($alpha)" {
-		if {![string compare $expect_out(1,string) "affinity"] || ![string compare $expect_out(1,string) "cgroup"]} {
-			set affinity 1
-		}
-		exp_continue
-	}
 	eof {
 		wait
 	}

testsuite/expect/test1.91

@@ -52,22 +52,7 @@ if {[test_launch_poe]} {
 #
 # Test if task affinity support is supported.
 #
-set affinity 0
-log_user 0
-spawn $scontrol show config
-expect {
-	-re "TaskPlugin *= task/($alpha)" {
-		if {![string compare $expect_out(1,string) "affinity"] || ![string compare $expect_out(1,string) "cgroup"]} {
-			set affinity 1
-		}
-		exp_continue
-	}
-	eof {
-		wait
-	}
-}
-log_user 1
-if {$affinity == 0} {
+if {![test_affinity]} {
 	send_user "\nWARNING: task affinity not supported on this system\n"
 	exit 0
 }