From 2450ebbded281e320d98e15392b80d24dc93054e Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Mon, 30 Mar 2009 21:41:09 +0000
Subject: [PATCH] Tweak totalviewcli tests to be closer to what the totalview
GUI actually executes per instructions from Matt Wolfe
---
testsuite/expect/test7.4 | 12 ++++++++++--
testsuite/expect/test7.6 | 6 +++++-
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/testsuite/expect/test7.4 b/testsuite/expect/test7.4
index ba13a944918..4461137f76a 100755
--- a/testsuite/expect/test7.4
+++ b/testsuite/expect/test7.4
@@ -50,8 +50,8 @@ set exit_code 0
set test_prog "test$test_id.prog"
# Note this appears as a single argv value to totalviewcli
-set bulk "set issue_dgo false; dset TV::bulk_launch_enabled true; dset TV::bulk_launch_string {$srun -N%N -n%N --jobid=%J -w`awk -F. \'BEGIN {ORS=\",\"} {if (NR==%N) ORS=\"\"; print \$1}\' %t1` -l -i /dev/null %B/tvdsvr%K -callback_host %H -callback_ports %L -set_pws %P -verbosity %V -working_directory %D %F}"
-set no_bulk "set issue_dgo false; dset TV::bulk_launch_enabled false"
+set bulk "dset TV::bulk_launch_enabled true; dset TV::bulk_launch_tmpfile1_host_lines %R; dset TV::bulk_launch_string {$srun --jobid=%J -N%N -n%N -w`awk -F. \'BEGIN {ORS=\",\"} {if (NR==%N) ORS=\"\"; print \$1}\' %t1` -l --input=none %B/tvdsvr%K -callback_host %H -callback_ports %L -set_pws %P -verbosity %V -working_directory %D %F}"
+set no_bulk "dset TV::bulk_launch_enabled false"
print_header $test_id
@@ -151,6 +151,10 @@ expect {
send "yes\n"
exp_continue
}
+ -re "Could not open breakpoint file" {
+ send_user "\nNOTE: Breakpoint file error is expected due to known Totalview bug\n"
+ exp_continue
+ }
timeout {
send_user "\nFAILURE: totalviewcli not responding\n"
set exit_code 1
@@ -229,6 +233,10 @@ expect {
send "yes\n"
exp_continue
}
+ -re "Could not open breakpoint file" {
+ send_user "\nNOTE: Breakpoint file error is expected due to known Totalview bug\n"
+ exp_continue
+ }
timeout {
send_user "\nFAILURE: totalviewcli not responding\n"
set exit_code 1
diff --git a/testsuite/expect/test7.6 b/testsuite/expect/test7.6
index a8c577d0614..855e4fa5c76 100755
--- a/testsuite/expect/test7.6
+++ b/testsuite/expect/test7.6
@@ -51,7 +51,7 @@ set test_prog "test$test_id.prog"
set timeout $max_job_delay
# Note this appears as a single argv value to totalviewcli
-set no_bulk "set issue_dgo false; dset TV::bulk_launch_enabled false"
+set no_bulk "dset TV::bulk_launch_enabled false"
print_header $test_id
@@ -181,6 +181,10 @@ expect {
send "yes\n"
exp_continue
}
+ -re "Could not open breakpoint file" {
+ send_user "\nNOTE: Breakpoint file error is expected due to known Totalview bug\n"
+ exp_continue
+ }
timeout {
send_user "\nFAILURE: totalviewcli not responding\n"
set exit_code 1
--
GitLab