From 57c69bef13298a3fbcedebf4c5fcecc690b75efb Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Mon, 24 Sep 2012 20:52:13 +0000 Subject: Set "fail on error" mode directly in testsuite shell scripts --- localedata/ChangeLog | 14 ++++++++++++++ localedata/Makefile | 25 ++++++++++++------------- localedata/gen-locale.sh | 5 +++-- localedata/sort-test.sh | 4 +++- localedata/tst-ctype.sh | 5 +++-- localedata/tst-fmon.sh | 5 +++-- localedata/tst-langinfo.sh | 5 +++-- localedata/tst-locale.sh | 5 +++-- localedata/tst-mbswcs.sh | 5 +++-- localedata/tst-numeric.sh | 5 +++-- localedata/tst-rpmatch.sh | 4 +++- localedata/tst-trans.sh | 5 +++-- localedata/tst-wctype.sh | 5 +++-- 13 files changed, 59 insertions(+), 33 deletions(-) (limited to 'localedata') diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 3723e1baf4..cd790c6e81 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,5 +1,19 @@ 2012-09-24 Dmitry V. Levin + * gen-locale.sh: Add "set -e". + * sort-test.sh: Likewise. + * tst-ctype.sh: Likewise. + * tst-fmon.sh: Likewise. + * tst-langinfo.sh: Likewise. + * tst-locale.sh: Likewise. + * tst-mbswcs.sh: Likewise. + * tst-numeric.sh: Likewise. + * tst-rpmatch.sh: Likewise. + * tst-trans.sh: Likewise. + * tst-wctype.sh: Likewise. + * Makefile: Do not specify -e option when running testsuite + shell scripts. + * sort-test.sh: Add copyright header. 2012-09-05 Jeff Law diff --git a/localedata/Makefile b/localedata/Makefile index 0873a5524f..5be2413d3c 100644 --- a/localedata/Makefile +++ b/localedata/Makefile @@ -1,5 +1,4 @@ -# Copyright (C) 1996-2003,2005,2007-2009,2011,2012 -# Free Software Foundation, Inc. +# Copyright (C) 1996-2012 Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -134,7 +133,7 @@ generated-dirs += $(LOCALES) $(addprefix $(objpfx),$(CTYPE_FILES)): %: \ gen-locale.sh $(common-objpfx)locale/localedef Makefile \ $(addprefix charmaps/,$(CHARMAPS)) $(addprefix locales/,$(LOCALE_SRCS)) - @$(SHELL) -e gen-locale.sh $(common-objpfx) '$(built-program-cmd)' $@ + @$(SHELL) gen-locale.sh $(common-objpfx) '$(built-program-cmd)' $@ $(addsuffix .out,$(addprefix $(objpfx),$(tests))): %: \ $(addprefix $(objpfx),$(CTYPE_FILES)) @@ -146,45 +145,45 @@ tests: $(objpfx)sort-test.out $(objpfx)tst-fmon.out $(objpfx)tst-locale.out \ $(objpfx)sort-test.out: sort-test.sh $(objpfx)collate-test $(objpfx)xfrm-test \ $(test-input-data) $(addprefix $(objpfx),$(CTYPE_FILES)) - $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' $(test-input) \ + $(SHELL) $< $(common-objpfx) '$(run-program-prefix)' $(test-input) \ > $@ $(objpfx)tst-fmon.out: tst-fmon.sh $(objpfx)tst-fmon tst-fmon.data \ $(objpfx)sort-test.out \ $(addprefix $(objpfx),$(CTYPE_FILES)) - $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' tst-fmon.data \ + $(SHELL) $< $(common-objpfx) '$(run-program-prefix)' tst-fmon.data \ > $@ $(objpfx)tst-numeric.out: tst-numeric.sh $(objpfx)tst-numeric tst-numeric.data \ $(objpfx)sort-test.out \ $(addprefix $(objpfx),$(CTYPE_FILES)) - $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' tst-numeric.data \ + $(SHELL) $< $(common-objpfx) '$(run-program-prefix)' tst-numeric.data \ > $@ $(objpfx)tst-locale.out: tst-locale.sh $(common-objpfx)locale/localedef \ $(ld-test-srcs) $(addprefix $(objpfx),$(CTYPE_FILES)) - $(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)' > $@ + $(SHELL) $< $(common-objpfx) '$(built-program-cmd)' > $@ $(objpfx)tst-rpmatch.out: tst-rpmatch.sh $(objpfx)tst-rpmatch \ $(objpfx)tst-fmon.out \ $(addprefix $(objpfx),$(CTYPE_FILES)) - $(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)' > $@ + $(SHELL) $< $(common-objpfx) '$(built-program-cmd)' > $@ $(objpfx)tst-trans.out: tst-trans.sh $(objpfx)tst-trans \ $(addprefix $(objpfx),$(CTYPE_FILES)) - $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' + $(SHELL) $< $(common-objpfx) '$(run-program-prefix)' $(objpfx)tst-mbswcs.out: tst-mbswcs.sh $(objpfx)tst-mbswcs1 \ $(objpfx)tst-mbswcs2 $(objpfx)tst-mbswcs3 \ $(objpfx)tst-mbswcs4 $(objpfx)tst-mbswcs5 \ $(addprefix $(objpfx),$(CTYPE_FILES)) - $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' + $(SHELL) $< $(common-objpfx) '$(run-program-prefix)' $(objpfx)tst-ctype.out: tst-ctype.sh $(objpfx)tst-ctype \ $(objpfx)sort-test.out \ $(addprefix $(objpfx),$(CTYPE_FILES)) - $(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)' + $(SHELL) $< $(common-objpfx) '$(built-program-cmd)' $(objpfx)tst-wctype.out: tst-wctype.sh $(objpfx)tst-wctype \ $(objpfx)sort-test.out tst-wctype.input \ $(addprefix $(objpfx),$(CTYPE_FILES)) - $(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)' + $(SHELL) $< $(common-objpfx) '$(built-program-cmd)' $(objpfx)tst-langinfo.out: tst-langinfo.sh $(objpfx)tst-langinfo \ $(objpfx)sort-test.out \ $(addprefix $(objpfx),$(CTYPE_FILES)) - $(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)' + $(SHELL) $< $(common-objpfx) '$(built-program-cmd)' $(objpfx)tst-digits.out: $(objpfx)tst-locale.out $(objpfx)tst-mbswcs6.out: $(addprefix $(objpfx),$(CTYPE_FILES)) endif diff --git a/localedata/gen-locale.sh b/localedata/gen-locale.sh index 89a9e06ee7..6dfa7caca9 100644 --- a/localedata/gen-locale.sh +++ b/localedata/gen-locale.sh @@ -1,8 +1,7 @@ #! /bin/sh # Generate test locale files. -# Copyright (C) 2000,01,02 Free Software Foundation, Inc. +# Copyright (C) 2000-2012 Free Software Foundation, Inc. # This file is part of the GNU C Library. -# # The GNU C Library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -18,6 +17,8 @@ # License along with the GNU C Library; if not, see # . +set -e + common_objpfx="$1"; shift localedef="$1"; shift locfile="$1"; shift diff --git a/localedata/sort-test.sh b/localedata/sort-test.sh index 3abe802e8c..8f8be8f67b 100644 --- a/localedata/sort-test.sh +++ b/localedata/sort-test.sh @@ -1,6 +1,6 @@ #! /bin/sh # Test collation using xfrm-test. -# Copyright (C) 1997-2004 Free Software Foundation, Inc. +# Copyright (C) 1997-2012 Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -17,6 +17,8 @@ # License along with the GNU C Library; if not, see # . +set -e + common_objpfx=$1; shift run_program_prefix=$1; shift lang=$* diff --git a/localedata/tst-ctype.sh b/localedata/tst-ctype.sh index 61f8cae62b..16420a89b4 100755 --- a/localedata/tst-ctype.sh +++ b/localedata/tst-ctype.sh @@ -1,8 +1,7 @@ #! /bin/sh # Testing the implementation of the isxxx() and toxxx() functions. -# Copyright (C) 2000 Free Software Foundation, Inc. +# Copyright (C) 2000-2012 Free Software Foundation, Inc. # This file is part of the GNU C Library. -# # The GNU C Library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -18,6 +17,8 @@ # License along with the GNU C Library; if not, see # . +set -e + common_objpfx=$1; shift tst_ctype=$1; shift status=0 diff --git a/localedata/tst-fmon.sh b/localedata/tst-fmon.sh index be6f128725..3e3dba9453 100755 --- a/localedata/tst-fmon.sh +++ b/localedata/tst-fmon.sh @@ -1,9 +1,8 @@ #! /bin/sh # Testing the implementation of strfmon(3). -# Copyright (C) 1996-1998, 2000, 2003, 2004 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 , 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 @@ -19,6 +18,8 @@ # License along with the GNU C Library; if not, see # . +set -e + common_objpfx=$1 run_program_prefix=$2 datafile=$3 diff --git a/localedata/tst-langinfo.sh b/localedata/tst-langinfo.sh index 567361c233..04771cb02d 100755 --- a/localedata/tst-langinfo.sh +++ b/localedata/tst-langinfo.sh @@ -1,8 +1,7 @@ #! /bin/sh # Test nl_langinfo. -# Copyright (C) 2000, 2001, 2003, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2000-2012 Free Software Foundation, Inc. # This file is part of the GNU C Library. -# # The GNU C Library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -18,6 +17,8 @@ # License along with the GNU C Library; if not, see # . +set -e + common_objpfx=$1 run_program_prefix=$2 diff --git a/localedata/tst-locale.sh b/localedata/tst-locale.sh index 96c26a750c..96eddc1187 100755 --- a/localedata/tst-locale.sh +++ b/localedata/tst-locale.sh @@ -1,9 +1,8 @@ #! /bin/sh # Testing the implementation of localedata. -# Copyright (C) 1998, 2000 Free Software Foundation, Inc. +# Copyright (C) 1998-2012 Free Software Foundation, Inc. # This file is part of the GNU C Library. # Contributed by Andreas Jaeger, , 1998. -# # The GNU C Library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,6 +18,8 @@ # License along with the GNU C Library; if not, see # . +set -e + common_objpfx=$1; shift localedef=$1; shift diff --git a/localedata/tst-mbswcs.sh b/localedata/tst-mbswcs.sh index 30667890cd..5a067ec0da 100755 --- a/localedata/tst-mbswcs.sh +++ b/localedata/tst-mbswcs.sh @@ -1,8 +1,7 @@ #! /bin/sh # Testing the implementation of the mb*towc*() and wc*tomb*() functions. -# Copyright (C) 2000 Free Software Foundation, Inc. +# Copyright (C) 2000-2012 Free Software Foundation, Inc. # This file is part of the GNU C Library. -# # The GNU C Library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -18,6 +17,8 @@ # License along with the GNU C Library; if not, see # . +set -e + common_objpfx=$1; shift run_program_prefix=$1; shift diff --git a/localedata/tst-numeric.sh b/localedata/tst-numeric.sh index b78fc94830..71a305832e 100644 --- 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 , 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 @@ -19,6 +18,8 @@ # License along with the GNU C Library; if not, see # . +set -e + common_objpfx=$1 run_program_prefix=$2 datafile=$3 diff --git a/localedata/tst-rpmatch.sh b/localedata/tst-rpmatch.sh index d8c79f7b00..0fb0cdf1ea 100755 --- a/localedata/tst-rpmatch.sh +++ b/localedata/tst-rpmatch.sh @@ -1,6 +1,6 @@ #! /bin/sh -f # -# Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. +# Copyright (C) 1998-2012 Free Software Foundation, Inc. # This file is part of the GNU C Library and contains tests for # the rpmatch(3)-implementation. # contributed by Jochen Hein @@ -18,6 +18,8 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, see . +set -e + common_objpfx=$1 tst_rpmatch=$2 diff --git a/localedata/tst-trans.sh b/localedata/tst-trans.sh index 5155a35852..e90b653ed1 100755 --- a/localedata/tst-trans.sh +++ b/localedata/tst-trans.sh @@ -1,8 +1,7 @@ #! /bin/sh # Test character mapping definitions. -# Copyright (C) 1999, 2000 Free Software Foundation, Inc. +# Copyright (C) 1999-2012 Free Software Foundation, Inc. # This file is part of the GNU C Library. -# # The GNU C Library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -18,6 +17,8 @@ # License along with the GNU C Library; if not, see # . +set -e + common_objpfx=$1 run_program_prefix=$2 diff --git a/localedata/tst-wctype.sh b/localedata/tst-wctype.sh index 3c657815d4..0dd8a82fa2 100755 --- a/localedata/tst-wctype.sh +++ b/localedata/tst-wctype.sh @@ -1,8 +1,7 @@ #! /bin/sh # Test locale-define character classes. -# Copyright (C) 1999, 2000 Free Software Foundation, Inc. +# Copyright (C) 1999-2012 Free Software Foundation, Inc. # This file is part of the GNU C Library. -# # The GNU C Library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -18,6 +17,8 @@ # License along with the GNU C Library; if not, see # . +set -e + common_objpfx=$1 run_program_prefix=$2 -- cgit 1.4.1