Set "fail on error" mode directly in testsuite shell scripts

[platform/upstream/glibc.git] / localedata / tst-numeric.sh

diff --git a/localedata/tst-numeric.sh b/localedata/tst-numeric.sh
index f590dfd..71a3058 100644 (file)
--- a/localedata/tst-numeric.sh
+++ b/localedata/tst-numeric.sh
@@ -1,9 +1,8 @@
 #! /bin/sh
 # Testing the implementation of LC_NUMERIC and snprintf(3).
-# Copyright (C) 1996, 1997, 1998, 2000, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 # Contributed by Jochen Hein <jochen.hein@delphi.central.de>, 1997.
-#
 
 # The GNU C Library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -16,34 +15,37 @@
 # Lesser General Public License for more details.
 
 # You should have received a copy of the GNU Lesser General Public
-# License along with the GNU C Library; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
+# License along with the GNU C Library; if not, see
+# <http://www.gnu.org/licenses/>.
+
+set -e
 
 common_objpfx=$1
 run_program_prefix=$2
 datafile=$3
 
 # Run the tests.
+errcode=0
 # There's a TAB for IFS
 while IFS="    " read locale format value expect; do
     case "$locale" in '#'*) continue ;; esac
     if [ -n "$format" ]; then
-       LOCPATH=${common_objpfx}localedata \
-       GCONV_PATH=${common_objpfx}/iconvdata \
-       ${run_program_prefix} ${common_objpfx}localedata/tst-numeric \
+       if LOCPATH=${common_objpfx}localedata \
+           GCONV_PATH=${common_objpfx}/iconvdata \
+           ${run_program_prefix} ${common_objpfx}localedata/tst-numeric \
            "$locale" "$format" "$value" "$expect"
-       if [ $? -eq 0 ]; then
+       then
            echo "Locale: \"${locale}\" Format: \"${format}\"" \
                 "Value: \"${value}\" Expect: \"${expect}\"  passed"
        else
+           errcode=$?
            echo "Locale: \"${locale}\" Format: \"${format}\"" \
                 "Value: \"${value}\" Expect: \"${expect}\"    failed"
        fi
     fi
 done < $datafile
 
-exit $?
+exit $errcode
 # Local Variables:
 #  mode:shell-script
 # End: