From 48a5a9d89085de135b61ec0c2a4fead1cf5cc61d Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Fri, 12 May 2006 00:10:52 +0000
Subject: [PATCH] fixes to the tests and changed prompt var in globals to match
my prompt
---
testsuite/expect/globals | 2 +-
testsuite/expect/test1.30 | 3 +++
testsuite/expect/test1.52 | 5 ++++-
testsuite/expect/test2.7 | 2 +-
4 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/testsuite/expect/globals b/testsuite/expect/globals
index 7bb85f8ec69..207c710a7a3 100755
--- a/testsuite/expect/globals
+++ b/testsuite/expect/globals
@@ -77,7 +77,7 @@ cset mpirun "mpirun"
cset totalviewcli "/usr/local/bin/totalviewcli"
# Pattern to match your shell prompt
-cset prompt "(%|#|\\\$) $"
+cset prompt "(%|#|\\\$) *$"
#
# Specify locations of other executable files used
diff --git a/testsuite/expect/test1.30 b/testsuite/expect/test1.30
index 0a6ee8488a7..11cd14329fc 100755
--- a/testsuite/expect/test1.30
+++ b/testsuite/expect/test1.30
@@ -93,6 +93,9 @@ for {set node_cnt 1} {$node_cnt > 0} {set node_cnt [expr $node_cnt * 2]} {
wait
}
}
+ if {$node_cnt > 30000} {
+ break
+ }
}
if {$error == 1} {
diff --git a/testsuite/expect/test1.52 b/testsuite/expect/test1.52
index a4be143abfc..354398c9f19 100755
--- a/testsuite/expect/test1.52
+++ b/testsuite/expect/test1.52
@@ -46,7 +46,10 @@ set hostfile "test$test_id.hostfile"
print_header $test_id
exec $bin_rm -f $hostfile
-
+if { [test_front_end] } {
+ send_user "\nWARNING: This test incompatable with front-end Systems\n"
+ exit $exit_code
+}
#find out if we have enough nodes to test functionality
spawn $scontrol show partition $partition
expect {
diff --git a/testsuite/expect/test2.7 b/testsuite/expect/test2.7
index 7c4eea833e1..de5dd0c8675 100755
--- a/testsuite/expect/test2.7
+++ b/testsuite/expect/test2.7
@@ -111,7 +111,7 @@ if {[wait_for_file $file_out] == 0} {
}
}
if {$rem_time > 60} {
- send_user "\nFAILURE: job remaining time is wrong\n"
+ send_user "\nFAILURE: job remaining time is wrong $rem_time\n"
set exit_code 1
}
if {$rem_time < 59} {
--
GitLab