From 40627621c486bc26c2c49ee7ee88b750cd9b8599 Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Fri, 17 Aug 2012 12:15:52 -0700
Subject: [PATCH] POE: Fix some tests for clean POE use or on system with bad
clocks
---
testsuite/expect/test1.34 | 3 +--
testsuite/expect/test14.5 | 2 +-
testsuite/expect/test26.2 | 2 +-
testsuite/expect/test3.7 | 2 +-
testsuite/expect/test7.8 | 2 +-
testsuite/expect/test8.7 | 2 +-
6 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/testsuite/expect/test1.34 b/testsuite/expect/test1.34
index 44449403649..70a0490aa75 100755
--- a/testsuite/expect/test1.34
+++ b/testsuite/expect/test1.34
@@ -49,8 +49,7 @@ if {[test_front_end] != 0} {
# Delete left-over program and rebuild it
#
file delete $test_prog
-
-exec $bin_make -f /dev/null $test_prog
+exec $bin_cc -o $file_prog ${file_prog}.c
exec $bin_chmod 700 $test_prog
#
diff --git a/testsuite/expect/test14.5 b/testsuite/expect/test14.5
index 7c0d7b8e0eb..00a699c00d2 100755
--- a/testsuite/expect/test14.5
+++ b/testsuite/expect/test14.5
@@ -145,7 +145,7 @@ if {[wait_for_file $file_out] == 0} {
}
if {$record != 3} {
- send_user "\nFAILURE: Wrong record count $record\n"
+ send_user "\nFAILURE: Wrong record count ($record != 3)\n"
set exit_code 1
}
if {$preserved == 0} {
diff --git a/testsuite/expect/test26.2 b/testsuite/expect/test26.2
index 28bc81cd027..c336fb6c0d0 100755
--- a/testsuite/expect/test26.2
+++ b/testsuite/expect/test26.2
@@ -74,7 +74,7 @@ if {$is_aprun_wrapper == 0} {
# Try to impose a job step time limit via ALPS using
# srun wrapper's --alps option
#
-make bash_script $file_in "$bin_sleep $sleep_time; echo FINI"
+make_bash_script $file_in "$bin_sleep $sleep_time; echo FINI"
set timeout [expr $max_job_delay + $sleep_time]
spawn $salloc -t4 $srun --alps=\"-t 1\" $file_in
expect {
diff --git a/testsuite/expect/test3.7 b/testsuite/expect/test3.7
index 0bc12be0263..3e6435f80ee 100755
--- a/testsuite/expect/test3.7
+++ b/testsuite/expect/test3.7
@@ -122,7 +122,7 @@ proc check_output { file_name } {
file delete $file_prog $file_out1 $file_out2
make_bash_script $file_prog_sh1 "$srun ./$file_prog"
make_bash_script $file_prog_sh2 "./$file_prog"
-exec $bin_make -f /dev/null $file_prog
+exec $bin_cc -o $file_prog ${file_prog}.c
exec $bin_chmod 700 $file_prog
#
diff --git a/testsuite/expect/test7.8 b/testsuite/expect/test7.8
index f5b92388692..e7cf1305413 100755
--- a/testsuite/expect/test7.8
+++ b/testsuite/expect/test7.8
@@ -170,7 +170,7 @@ if {$job_id2 == 0} {
# Start our Moab emulator ($test_prog) to manage the job
#
exec $bin_rm -f $test_prog
-exec $bin_make -f /dev/null $test_prog
+exec $bin_cc -o $file_prog ${file_prog}.c
set success 0
set moab_pid [spawn $test_prog $control_addr $job_id1 $job_id2 $sched_port $is_bluegene]
expect {
diff --git a/testsuite/expect/test8.7 b/testsuite/expect/test8.7
index aeb51545ff3..bc1835f0045 100755
--- a/testsuite/expect/test8.7
+++ b/testsuite/expect/test8.7
@@ -217,7 +217,7 @@ if {$job_id4 == 0} {
#
set timeout 60
exec $bin_rm -f $test_prog
-exec $bin_make -f /dev/null $test_prog
+exec $bin_cc -o $file_prog ${file_prog}.c
set success 0
set moab_pid [spawn $test_prog $auth_key $control_addr $e_port $sched_port $job_id1 $job_id2 $job_id3 $job_id4]
set master_id $spawn_id
--
GitLab