diff --git a/testsuite/expect/regression b/testsuite/expect/regression index b59af852566793b015831428666601a4ed3a12a7..14b89596c0772d29b3e275a4ffc2bd58c322df33 100755 --- a/testsuite/expect/regression +++ b/testsuite/expect/regression @@ -40,7 +40,7 @@ if [ ! -x ./regression ]; then exit 1 fi if [ ! -x ./globals ]; then - echo "FAILURE: copy 'globals.example' to 'globals' and modify as needed" + echo "FAILURE: 'globals' file not found" exit 1 fi diff --git a/testsuite/expect/test1.44 b/testsuite/expect/test1.44 index e66c46909981a9f8113d39acb95d575881f5cf1c..993f1aa9a221e4c46db4730cfafffd4d3f5b703d 100755 --- a/testsuite/expect/test1.44 +++ b/testsuite/expect/test1.44 @@ -8,7 +8,8 @@ # "FAILURE: ..." otherwise with an explanation of the failure, OR # anything else indicates a failure mode that must be investigated. ############################################################################ -# Copyright (C) 2005 The Regents of the University of California. +# Copyright (C) 2002-2007 The Regents of the University of California. +# Copyright (C) 2008 Lawrence Livermore National Security. # Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). # Written by Chris Morrone <morrone2@llnl.gov> # LLNL-CODE-402394. @@ -97,7 +98,11 @@ for {set inx 0} {$inx < $cycle_count} {incr inx} { set stdout_lines [get_line_cnt $file_out] } if {$stdout_lines != $stdout_target} { - send_user "\nFAILURE: stdout is incomplete\n" + if {$stdout_lines == 0} { + send_user "\nFAILURE: stdout is empty, is current working directory writable from compute nodes?\n" + } else { + send_user "\nFAILURE:stdout is incomplete\n" + } set exit_code 1 break } else { diff --git a/testsuite/expect/test9.1 b/testsuite/expect/test9.1 index b2e1f3bb47cd0d67b9c682597147d36c10d15a45..16c03cd15b0ef51faf6dd115ec4c8b323118e65a 100755 --- a/testsuite/expect/test9.1 +++ b/testsuite/expect/test9.1 @@ -9,7 +9,8 @@ # Note: This script generates and then deletes files in the working directory # named test9.1.input and test9.1.output ############################################################################ -# Copyright (C) 2002 The Regents of the University of California. +# Copyright (C) 2002-2007 The Regents of the University of California. +# Copyright (C) 2008 Lawrence Livermore National Security. # Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). # Written by Morris Jette <jette1@llnl.gov> # LLNL-CODE-402394. @@ -105,7 +106,11 @@ for {set inx 0} {$inx < $cycle_count} {incr inx} { set stdout_lines [get_line_cnt $file_out] } if {$stdout_lines != $stdout_target} { - send_user "\nFAILURE: stdout is incomplete\n" + if {$stdout_lines == 0} { + send_user "\nFAILURE: stdout is empty, is current working directory writable from compute nodes?\n" + } else { + send_user "\nFAILURE:stdout is incomplete\n" + } set cycle_count [expr $inx + 1] set exit_code 1 break diff --git a/testsuite/expect/test9.2 b/testsuite/expect/test9.2 index 34a71af12aa03dfc38f4d74cf8a22958487f9cd5..49dbaffc26e3851ae33df84fccb4931d6b61a3d5 100755 --- a/testsuite/expect/test9.2 +++ b/testsuite/expect/test9.2 @@ -9,7 +9,8 @@ # Note: This script generates and then deletes files in the working directory # named test9.2.output ############################################################################ -# Copyright (C) 2002-2006 The Regents of the University of California. +# Copyright (C) 2002-2007 The Regents of the University of California. +# Copyright (C) 2008 Lawrence Livermore National Security. # Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). # Written by Morris Jette <jette1@llnl.gov> # LLNL-CODE-402394. @@ -95,7 +96,11 @@ for {set inx 0} {$inx < $cycle_count} {incr inx} { set stdout_lines [get_line_cnt $file_out] } if {$stdout_lines != $task_cnt} { - send_user "\nFAILURE:stdout is incomplete\n" + if {$stdout_lines == 0} { + send_user "\nFAILURE: stdout is empty, is current working directory writable from compute nodes?\n" + } else { + send_user "\nFAILURE:stdout is incomplete\n" + } set cycle_count [expr $inx + 1] set exit_code 1 break diff --git a/testsuite/expect/test9.3 b/testsuite/expect/test9.3 index 7a392520bedf436538a0c0c1992bcb6d0952573e..8d9567ca435e0ee3caa910d105defa8309f7dba1 100755 --- a/testsuite/expect/test9.3 +++ b/testsuite/expect/test9.3 @@ -9,7 +9,8 @@ # Note: This script generates and then deletes files in the working directory # named test9.3.output ############################################################################ -# Copyright (C) 2002-2006 The Regents of the University of California. +# Copyright (C) 2002-2007 The Regents of the University of California. +# Copyright (C) 2008 Lawrence Livermore National Security. # Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). # Written by Morris Jette <jette1@llnl.gov> # LLNL-CODE-402394. @@ -105,7 +106,11 @@ for {set inx 0} {$inx < $cycle_count} {incr inx} { set stdout_lines [get_line_cnt $file_out] } if {$stdout_lines != $stdout_target} { - send_user "\nFAILURE:stdout is incomplete\n" + if {$stdout_lines == 0} { + send_user "\nFAILURE: stdout is empty, is current working directory writable from compute nodes?\n" + } else { + send_user "\nFAILURE:stdout is incomplete\n" + } set cycle_count [expr $inx + 1] set exit_code 1 break diff --git a/testsuite/expect/test9.4 b/testsuite/expect/test9.4 index 0b7d95750089249dafca2c10c4d22ba2ccb8f9ce..86d680ed48b1934e13455edf23ecfa217f149bfe 100755 --- a/testsuite/expect/test9.4 +++ b/testsuite/expect/test9.4 @@ -10,10 +10,12 @@ # we create them ahead of time. Without explicity file creation, # this test requires about one minute per cycle to execute. # -# Note: This script generates and then deletes files in the working directory -# named test9.4.input, test9.4.[0-9]+.input, and test9.4.[0-9]+.output +# Note: This script generates and then deletes files in the working +# directory named test9.4.input, test9.4.[0-9]+.input, and +# test9.4.[0-9]+.output ############################################################################ -# Copyright (C) 2002-2006 The Regents of the University of California. +# Copyright (C) 2002-2007 The Regents of the University of California. +# Copyright (C) 2008 Lawrence Livermore National Security. # Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). # Written by Morris Jette <jette1@llnl.gov> # LLNL-CODE-402394. @@ -135,7 +137,11 @@ for {set inx 0} {$inx < $cycle_count} {incr inx} { set stdout_lines [get_line_cnt $file_out_glob] } if {$stdout_lines != $stdin_lines} { - send_user "\nFAILURE:stdout is incomplete\n" + if {$stdout_lines == 0} { + send_user "\nFAILURE: stdout is empty, is current working directory writable from compute nodes?\n" + } else { + send_user "\nFAILURE:stdout is incomplete\n" + } set exit_code 1 } else { incr success_cnt diff --git a/testsuite/expect/test9.5 b/testsuite/expect/test9.5 index fb8a46b9b082abe576da9ce896d5ba77d0b9a121..087939383f48a3a7ce92efcc95a0b1fee3c22271 100755 --- a/testsuite/expect/test9.5 +++ b/testsuite/expect/test9.5 @@ -6,7 +6,8 @@ # "FAILURE: ..." otherwise with an explanation of the failure, OR # anything else indicates a failure mode that must be investigated. ############################################################################ -# Copyright (C) 2002-2006 The Regents of the University of California. +# Copyright (C) 2002-2007 The Regents of the University of California. +# Copyright (C) 2008 Lawrence Livermore National Security. # Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). # Written by Morris Jette <jette1@llnl.gov> # LLNL-CODE-402394. @@ -119,7 +120,11 @@ for {set inx 0} {$inx < $cycle_count} {incr inx} { set stdout_lines [get_line_cnt $file_out] } if {$stdout_lines != $stdout_target} { - send_user "\nFAILURE:stdout is missing output\n" + if {$stdout_lines == 0} { + send_user "\nFAILURE: stdout is empty, is current working directory writable from compute nodes?\n" + } else { + send_user "\nFAILURE:stdout is incomplete\n" + } set exit_code 1 } else { incr success_cnt diff --git a/testsuite/expect/test9.6 b/testsuite/expect/test9.6 index a057883f1210f2a0e1fc472473bc528e19c25d74..2dda35de63f077b4a5d5c8e520bb97e850928a6b 100755 --- a/testsuite/expect/test9.6 +++ b/testsuite/expect/test9.6 @@ -6,10 +6,11 @@ # "FAILURE: ..." otherwise with an explanation of the failure, OR # anything else indicates a failure mode that must be investigated. # -# Note: This script generates and then deletes files in the working directory +# Note: This script generates and then deletes files in the working directory # named test9.6.input and test9.6.output ############################################################################ -# Copyright (C) 2002-2006 The Regents of the University of California. +# Copyright (C) 2002-2007 The Regents of the University of California. +# Copyright (C) 2008 Lawrence Livermore National Security. # Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). # Written by Morris Jette <jette1@llnl.gov> # LLNL-CODE-402394. @@ -102,11 +103,15 @@ for {set inx 0} {$inx < $cycle_count} {incr inx} { } set stdout_lines [get_line_cnt $file_out] if {$stdout_lines != $stdout_target} { - exec $bin_sleep 1 + exec $bin_sleep 1 set stdout_lines [get_line_cnt $file_out] } if {$stdout_lines != $stdout_target} { - send_user "\nFAILURE:stdout is missing output\n" + if {$stdout_lines == 0} { + send_user "\nFAILURE: stdout is empty, is current working directory writable from compute nodes?\n" + } else { + send_user "\nFAILURE:stdout is incomplete\n" + } set cycle_count [expr $inx + 1] set exit_code 1 break