Skip to content
Snippets Groups Projects
Commit d067956e authored by Moe Jette's avatar Moe Jette
Browse files

modify some error messages for greater clarity

parent 8eed4b12
No related branches found
No related tags found
No related merge requests found
...@@ -40,7 +40,7 @@ if [ ! -x ./regression ]; then ...@@ -40,7 +40,7 @@ if [ ! -x ./regression ]; then
exit 1 exit 1
fi fi
if [ ! -x ./globals ]; then if [ ! -x ./globals ]; then
echo "FAILURE: copy 'globals.example' to 'globals' and modify as needed" echo "FAILURE: 'globals' file not found"
exit 1 exit 1
fi fi
......
...@@ -8,7 +8,8 @@ ...@@ -8,7 +8,8 @@
# "FAILURE: ..." otherwise with an explanation of the failure, OR # "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated. # 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). # Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Chris Morrone <morrone2@llnl.gov> # Written by Chris Morrone <morrone2@llnl.gov>
# LLNL-CODE-402394. # LLNL-CODE-402394.
...@@ -97,7 +98,11 @@ for {set inx 0} {$inx < $cycle_count} {incr inx} { ...@@ -97,7 +98,11 @@ for {set inx 0} {$inx < $cycle_count} {incr inx} {
set stdout_lines [get_line_cnt $file_out] set stdout_lines [get_line_cnt $file_out]
} }
if {$stdout_lines != $stdout_target} { 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 set exit_code 1
break break
} else { } else {
......
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
# 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.1.input and test9.1.output # 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). # Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov> # Written by Morris Jette <jette1@llnl.gov>
# LLNL-CODE-402394. # LLNL-CODE-402394.
...@@ -105,7 +106,11 @@ for {set inx 0} {$inx < $cycle_count} {incr inx} { ...@@ -105,7 +106,11 @@ for {set inx 0} {$inx < $cycle_count} {incr inx} {
set stdout_lines [get_line_cnt $file_out] set stdout_lines [get_line_cnt $file_out]
} }
if {$stdout_lines != $stdout_target} { 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 cycle_count [expr $inx + 1]
set exit_code 1 set exit_code 1
break break
......
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
# 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.2.output # 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). # Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov> # Written by Morris Jette <jette1@llnl.gov>
# LLNL-CODE-402394. # LLNL-CODE-402394.
...@@ -95,7 +96,11 @@ for {set inx 0} {$inx < $cycle_count} {incr inx} { ...@@ -95,7 +96,11 @@ for {set inx 0} {$inx < $cycle_count} {incr inx} {
set stdout_lines [get_line_cnt $file_out] set stdout_lines [get_line_cnt $file_out]
} }
if {$stdout_lines != $task_cnt} { 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 cycle_count [expr $inx + 1]
set exit_code 1 set exit_code 1
break break
......
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
# 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.3.output # 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). # Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov> # Written by Morris Jette <jette1@llnl.gov>
# LLNL-CODE-402394. # LLNL-CODE-402394.
...@@ -105,7 +106,11 @@ for {set inx 0} {$inx < $cycle_count} {incr inx} { ...@@ -105,7 +106,11 @@ for {set inx 0} {$inx < $cycle_count} {incr inx} {
set stdout_lines [get_line_cnt $file_out] set stdout_lines [get_line_cnt $file_out]
} }
if {$stdout_lines != $stdout_target} { 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 cycle_count [expr $inx + 1]
set exit_code 1 set exit_code 1
break break
......
...@@ -10,10 +10,12 @@ ...@@ -10,10 +10,12 @@
# we create them ahead of time. Without explicity file creation, # we create them ahead of time. Without explicity file creation,
# this test requires about one minute per cycle to execute. # this test requires about one minute per cycle to execute.
# #
# Note: This script generates and then deletes files in the working directory # Note: This script generates and then deletes files in the working
# named test9.4.input, test9.4.[0-9]+.input, and test9.4.[0-9]+.output # 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). # Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov> # Written by Morris Jette <jette1@llnl.gov>
# LLNL-CODE-402394. # LLNL-CODE-402394.
...@@ -135,7 +137,11 @@ for {set inx 0} {$inx < $cycle_count} {incr inx} { ...@@ -135,7 +137,11 @@ for {set inx 0} {$inx < $cycle_count} {incr inx} {
set stdout_lines [get_line_cnt $file_out_glob] set stdout_lines [get_line_cnt $file_out_glob]
} }
if {$stdout_lines != $stdin_lines} { 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 set exit_code 1
} else { } else {
incr success_cnt incr success_cnt
......
...@@ -6,7 +6,8 @@ ...@@ -6,7 +6,8 @@
# "FAILURE: ..." otherwise with an explanation of the failure, OR # "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated. # 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). # Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov> # Written by Morris Jette <jette1@llnl.gov>
# LLNL-CODE-402394. # LLNL-CODE-402394.
...@@ -119,7 +120,11 @@ for {set inx 0} {$inx < $cycle_count} {incr inx} { ...@@ -119,7 +120,11 @@ for {set inx 0} {$inx < $cycle_count} {incr inx} {
set stdout_lines [get_line_cnt $file_out] set stdout_lines [get_line_cnt $file_out]
} }
if {$stdout_lines != $stdout_target} { 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 set exit_code 1
} else { } else {
incr success_cnt incr success_cnt
......
...@@ -6,10 +6,11 @@ ...@@ -6,10 +6,11 @@
# "FAILURE: ..." otherwise with an explanation of the failure, OR # "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated. # 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 # 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). # Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov> # Written by Morris Jette <jette1@llnl.gov>
# LLNL-CODE-402394. # LLNL-CODE-402394.
...@@ -102,11 +103,15 @@ for {set inx 0} {$inx < $cycle_count} {incr inx} { ...@@ -102,11 +103,15 @@ for {set inx 0} {$inx < $cycle_count} {incr inx} {
} }
set stdout_lines [get_line_cnt $file_out] set stdout_lines [get_line_cnt $file_out]
if {$stdout_lines != $stdout_target} { if {$stdout_lines != $stdout_target} {
exec $bin_sleep 1 exec $bin_sleep 1
set stdout_lines [get_line_cnt $file_out] set stdout_lines [get_line_cnt $file_out]
} }
if {$stdout_lines != $stdout_target} { 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 cycle_count [expr $inx + 1]
set exit_code 1 set exit_code 1
break break
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment