diff options
| author | Dmitry V. Levin <ldv@altlinux.org> | 2012-09-24 20:52:13 +0000 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@altlinux.org> | 2012-09-25 02:48:31 +0000 |
| commit | 57c69bef13298a3fbcedebf4c5fcecc690b75efb (patch) | |
| tree | 9cc9d909afcb9e8b6c23697bdb48901e80d7addb | |
| parent | 9a9028b1fe1519262fcbf0b7ede708d4ebbffbd7 (diff) | |
| download | glibc-57c69bef13298a3fbcedebf4c5fcecc690b75efb.tar.gz glibc-57c69bef13298a3fbcedebf4c5fcecc690b75efb.tar.xz glibc-57c69bef13298a3fbcedebf4c5fcecc690b75efb.zip | |
Set "fail on error" mode directly in testsuite shell scripts
48 files changed, 187 insertions, 98 deletions
diff --git a/ChangeLog b/ChangeLog index cb4c0760f8..61f0546acb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,38 @@ 2012-09-24 Dmitry V. Levin <ldv@altlinux.org> + * catgets/test-gencat.sh: Add "set -e". + * elf/tst-pathopt.sh: Likewise. + * grp/tst_fgetgrent.sh: Likewise. + * iconvdata/run-iconv-test.sh: Likewise. + * intl/tst-gettext.sh: Likewise. + * intl/tst-gettext2.sh: Likewise. + * intl/tst-gettext4.sh: Likewise. + * intl/tst-gettext6.sh: Likewise. + * intl/tst-translit.sh: Likewise. + * io/ftwtest-sh: Likewise. + * libio/test-freopen.sh: Likewise. + * malloc/tst-mtrace.sh: Likewise. + * posix/globtest.sh: Likewise. + * posix/tst-getconf.sh: Likewise. + * posix/wordexp-tst.sh: Likewise. + * stdio-common/tst-printf.sh: Likewise. + * stdio-common/tst-unbputc.sh: Likewise. + * stdlib/tst-fmtmsg.sh: Likewise. + * sysdeps/x86_64/tst-xmmymm.sh: Likewise. + * catgets/Makefile: Do not specify -e option when running + testsuite shell scripts. + * elf/Makefile: Likewise. + * grp/Makefile: Likewise. + * iconvdata/Makefile: Likewise. + * intl/Makefile: Likewise. + * io/Makefile: Likewise. + * libio/Makefile: Likewise. + * malloc/Makefile: Likewise. + * posix/Makefile: Likewise. + * stdio-common/Makefile: Likewise. + * stdlib/Makefile: Likewise. + * sysdeps/x86_64/Makefile: Likewise. + * io/ftwtest-sh: Add copyright header. * posix/globtest.sh: Likewise. * posix/tst-getconf.sh: Likewise. diff --git a/catgets/Makefile b/catgets/Makefile index c11edd33c2..ec8fe1e0bc 100644 --- a/catgets/Makefile +++ b/catgets/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1996-2000, 2002-2004, 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 @@ -75,7 +75,7 @@ $(objpfx)de.msg: xopen-msg.awk $(..)po/de.po $(objpfx)test-gencat.out: test-gencat.sh $(objpfx)test-gencat \ $(objpfx)sample.SJIS.cat - $(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)' + $(SHELL) $< $(common-objpfx) '$(built-program-cmd)' $(objpfx)sample.SJIS.cat: sample.SJIS $(objpfx)gencat GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \ diff --git a/catgets/test-gencat.sh b/catgets/test-gencat.sh index 50594bc351..c884b8f200 100755 --- a/catgets/test-gencat.sh +++ b/catgets/test-gencat.sh @@ -1,8 +1,7 @@ #! /bin/sh # Test escape character handling in gencat. -# Copyright (C) 2000, 2001, 2002 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 # <http://www.gnu.org/licenses/>. +set -e + common_objpfx=$1 run_program_prefix=$2 diff --git a/elf/Makefile b/elf/Makefile index c844739adc..2eb12d37de 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -705,7 +705,7 @@ $(objpfx)lateglobal.out: $(objpfx)ltglobmod1.so $(objpfx)ltglobmod2.so $(objpfx)tst-pathopt: $(libdl) $(objpfx)tst-pathopt.out: tst-pathopt.sh $(objpfx)tst-pathopt \ $(objpfx)pathoptobj.so - $(SHELL) -e $< $(common-objpfx) + $(SHELL) $< $(common-objpfx) $(objpfx)tst-rtld-load-self.out: tst-rtld-load-self.sh $(objpfx)ld.so $(SHELL) $^ > $@ diff --git a/elf/tst-pathopt.sh b/elf/tst-pathopt.sh index c79b47b04d..048c612645 100755 --- a/elf/tst-pathopt.sh +++ b/elf/tst-pathopt.sh @@ -1,8 +1,7 @@ #! /bin/sh # Test lookup path optimization. -# 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 # <http://www.gnu.org/licenses/>. +set -e + common_objpfx=$1 run_program_prefix=$2 diff --git a/grp/Makefile b/grp/Makefile index ca620603f2..8cb99c1505 100644 --- a/grp/Makefile +++ b/grp/Makefile @@ -55,7 +55,7 @@ ifeq (no,$(cross-compiling)) ifeq (yes,$(build-shared)) tests: $(objpfx)tst_fgetgrent.out $(objpfx)tst_fgetgrent.out: tst_fgetgrent.sh $(objpfx)tst_fgetgrent - $(SHELL) -e tst_fgetgrent.sh $(common-objpfx) $(elf-objpfx) \ + $(SHELL) $< $(common-objpfx) $(elf-objpfx) \ $(rtld-installed-name) endif diff --git a/grp/tst_fgetgrent.sh b/grp/tst_fgetgrent.sh index cb80e73ded..7e69815ca1 100644 --- a/grp/tst_fgetgrent.sh +++ b/grp/tst_fgetgrent.sh @@ -1,8 +1,7 @@ #! /bin/sh -# Copyright (C) 1999 Free Software Foundation, Inc. +# Copyright (C) 1999-2012 Free Software Foundation, Inc. # This file is part of the GNU C Library. # Contributed by Andreas Jaeger <aj@arthur.rhein-neckar.de>, 1999. -# # 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 # <http://www.gnu.org/licenses/>. +set -e + common_objpfx=$1; shift elf_objpfx=$1; shift rtld_installed_name=$1; shift diff --git a/iconvdata/Makefile b/iconvdata/Makefile index eac51ba572..2ddcae5040 100644 --- a/iconvdata/Makefile +++ b/iconvdata/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1997-2008, 2011, 2012 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 @@ -299,7 +299,7 @@ $(objpfx)tst-iconv7.out: $(objpfx)gconv-modules \ $(objpfx)iconv-test.out: run-iconv-test.sh $(objpfx)gconv-modules \ $(addprefix $(objpfx),$(modules.so)) \ $(common-objdir)/iconv/iconv_prog TESTS - $(SHELL) -e $< $(common-objdir) > $@ + $(SHELL) $< $(common-objdir) > $@ $(objpfx)tst-tables.out: tst-tables.sh $(objpfx)gconv-modules \ $(addprefix $(objpfx),$(modules.so)) \ diff --git a/iconvdata/run-iconv-test.sh b/iconvdata/run-iconv-test.sh index 60be69f628..34c400d7e9 100755 --- a/iconvdata/run-iconv-test.sh +++ b/iconvdata/run-iconv-test.sh @@ -1,9 +1,8 @@ #! /bin/sh -f # Run available iconv(1) tests. -# Copyright (C) 1998-2002, 2005, 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 1998-2012 Free Software Foundation, Inc. # This file is part of the GNU C Library. # Contributed by Ulrich Drepper <drepper@cygnus.com>, 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 # <http://www.gnu.org/licenses/>. +set -e + codir=$1 # We use always the same temporary file. diff --git a/intl/Makefile b/intl/Makefile index d3ea4cb8cd..764badcab1 100644 --- a/intl/Makefile +++ b/intl/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1995-2003,2005,2008,2011,2012 Free Software Foundation, Inc. +# Copyright (C) 1995-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 @@ -74,16 +74,16 @@ $(codeset_mo): tstcodeset.po $(objpfx)mtrace-tst-gettext: $(objpfx)tst-gettext.out $(common-objpfx)malloc/mtrace $(objpfx)tst-gettext.mtrace > $@ $(objpfx)tst-gettext.out: tst-gettext.sh $(objpfx)tst-gettext - $(SHELL) -e $< $(common-objpfx) $(common-objpfx)intl/ \ + $(SHELL) $< $(common-objpfx) $(common-objpfx)intl/ \ $(objpfx)tst-gettext.mtrace $(objpfx)tst-translit.out: tst-translit.sh $(objpfx)tst-translit - $(SHELL) -e $< $(common-objpfx) $(common-objpfx)intl/ + $(SHELL) $< $(common-objpfx) $(common-objpfx)intl/ $(objpfx)tst-gettext2.out: tst-gettext2.sh $(objpfx)tst-gettext2 - $(SHELL) -e $< $(common-objpfx) $(common-objpfx)intl/ + $(SHELL) $< $(common-objpfx) $(common-objpfx)intl/ $(objpfx)tst-gettext4.out: tst-gettext4.sh $(objpfx)tst-gettext4 - $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' $(common-objpfx)intl/ + $(SHELL) $< $(common-objpfx) '$(run-program-prefix)' $(common-objpfx)intl/ $(objpfx)tst-gettext6.out: tst-gettext6.sh $(objpfx)tst-gettext6 - $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' $(common-objpfx)intl/ + $(SHELL) $< $(common-objpfx) '$(run-program-prefix)' $(common-objpfx)intl/ $(objpfx)tst-codeset.out: $(codeset_mo) $(objpfx)tst-gettext3.out: $(codeset_mo) diff --git a/intl/tst-gettext.sh b/intl/tst-gettext.sh index e8fee9f3c5..a3ac377987 100755 --- a/intl/tst-gettext.sh +++ b/intl/tst-gettext.sh @@ -1,8 +1,7 @@ #! /bin/sh # Test of gettext functions. -# Copyright (C) 2000, 2002, 2004 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 # <http://www.gnu.org/licenses/>. +set -e + common_objpfx=$1 objpfx=$2 malloc_trace=$3 diff --git a/intl/tst-gettext2.sh b/intl/tst-gettext2.sh index 656c2e1556..2d9c52fef9 100644 --- a/intl/tst-gettext2.sh +++ b/intl/tst-gettext2.sh @@ -1,8 +1,7 @@ #! /bin/sh # Test of gettext functions. -# Copyright (C) 2000, 2003, 2005 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 # <http://www.gnu.org/licenses/>. +set -e + common_objpfx=$1 objpfx=$2 diff --git a/intl/tst-gettext4.sh b/intl/tst-gettext4.sh index ac95be1975..4067071c78 100755 --- a/intl/tst-gettext4.sh +++ b/intl/tst-gettext4.sh @@ -1,9 +1,8 @@ #! /bin/sh # Test that gettext() in multithreaded applications works correctly if # different threads operate in different locales with the same encoding. -# Copyright (C) 2001, 2002, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001-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 @@ -19,6 +18,8 @@ # License along with the GNU C Library; if not, see # <http://www.gnu.org/licenses/>. +set -e + common_objpfx=$1 run_program_prefix=$2 objpfx=$3 diff --git a/intl/tst-gettext6.sh b/intl/tst-gettext6.sh index b83678ed05..2db0cd653a 100644 --- a/intl/tst-gettext6.sh +++ b/intl/tst-gettext6.sh @@ -1,8 +1,7 @@ #! /bin/sh # Test that gettext() in multithreaded applications works correctly. -# Copyright (C) 2008 Free Software Foundation, Inc. +# Copyright (C) 2008-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 # <http://www.gnu.org/licenses/>. +set -e + common_objpfx=$1 run_program_prefix=$2 objpfx=$3 diff --git a/intl/tst-translit.sh b/intl/tst-translit.sh index 3091ab96bb..93159c7cef 100755 --- a/intl/tst-translit.sh +++ b/intl/tst-translit.sh @@ -1,8 +1,7 @@ #! /bin/sh # Test of transliteration in gettext functions. -# Copyright (C) 2000, 2002, 2005 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 # <http://www.gnu.org/licenses/>. +set -e + common_objpfx=$1 objpfx=$2 diff --git a/io/Makefile b/io/Makefile index 6e3a737851..f6534c0bb4 100644 --- a/io/Makefile +++ b/io/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1992-2003,2005-2008,2011,2012 Free Software Foundation, Inc. +# Copyright (C) 1992-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 @@ -102,6 +102,6 @@ ifeq ($(cross-compiling),no) tests: $(objpfx)ftwtest.out $(objpfx)ftwtest.out: $(objpfx)ftwtest - $(SHELL) -e ftwtest-sh $(shell cd $(common-objpfx). && pwd)/ \ + $(SHELL) ftwtest-sh $(shell cd $(common-objpfx). && pwd)/ \ $(shell cd $(<D) && pwd)/$(<F) > $@ endif diff --git a/io/ftwtest-sh b/io/ftwtest-sh index 8b8abaaa11..1822ea7fcd 100644 --- a/io/ftwtest-sh +++ b/io/ftwtest-sh @@ -1,6 +1,6 @@ #! /bin/sh # Test for nftw(3). -# 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 # <http://www.gnu.org/licenses/>. +set -e + # The common objpfx, used to find libraries and the dynamic loader. objpfx=$1 diff --git a/libio/Makefile b/libio/Makefile index 090e1941e3..e2a7efdc1c 100644 --- a/libio/Makefile +++ b/libio/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1995-2004,2006-2009,2011,2012 Free Software Foundation, Inc. +# Copyright (C) 1995-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 @@ -184,7 +184,7 @@ endif endif $(objpfx)test-freopen.out: test-freopen.sh $(objpfx)test-freopen - $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' \ + $(SHELL) $< $(common-objpfx) '$(run-program-prefix)' \ $(common-objpfx)libio/ $(objpfx)tst-fopenloc.check: $(objpfx)tst-fopenloc.out diff --git a/libio/test-freopen.sh b/libio/test-freopen.sh index 07b4cf68dd..9ee453087b 100755 --- a/libio/test-freopen.sh +++ b/libio/test-freopen.sh @@ -1,8 +1,7 @@ #! /bin/sh # Test of freopen. -# Copyright (C) 2000, 2001 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 # <http://www.gnu.org/licenses/>. +set -e + common_objpfx=$1 run_program_prefix=$2 objpfx=$3 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 <ldv@altlinux.org> + * 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 <law@redhat.com> 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 # <http://www.gnu.org/licenses/>. +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 # <http://www.gnu.org/licenses/>. +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 # <http://www.gnu.org/licenses/>. +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 <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 @@ -19,6 +18,8 @@ # 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 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 # <http://www.gnu.org/licenses/>. +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, <aj@arthur.rhein-neckar.de>, 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 # <http://www.gnu.org/licenses/>. +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 # <http://www.gnu.org/licenses/>. +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 <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 @@ -19,6 +18,8 @@ # 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 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 <jochen.hein@delphi.central.de> @@ -18,6 +18,8 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, see <http://www.gnu.org/licenses/>. +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 # <http://www.gnu.org/licenses/>. +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 # <http://www.gnu.org/licenses/>. +set -e + common_objpfx=$1 run_program_prefix=$2 diff --git a/malloc/Makefile b/malloc/Makefile index 55c675b2cd..eb909fd64c 100644 --- a/malloc/Makefile +++ b/malloc/Makefile @@ -109,7 +109,7 @@ ifeq (yes,$(build-shared)) ifneq ($(PERL),no) tests: $(objpfx)tst-mtrace.out $(objpfx)tst-mtrace.out: tst-mtrace.sh $(objpfx)tst-mtrace - $(SHELL) -e $< $(common-objpfx) + $(SHELL) $< $(common-objpfx) endif endif endif diff --git a/malloc/tst-mtrace.sh b/malloc/tst-mtrace.sh index 9ed9518db1..14b0ad480f 100755 --- a/malloc/tst-mtrace.sh +++ b/malloc/tst-mtrace.sh @@ -1,8 +1,7 @@ #! /bin/sh # Testing the mtrace function. -# Copyright (C) 2000, 2005 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 # <http://www.gnu.org/licenses/>. +set -e + common_objpfx=$1; shift status=0 diff --git a/nptl/ChangeLog b/nptl/ChangeLog index aa1c04e95d..2176932501 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,5 +1,9 @@ 2012-09-24 Dmitry V. Levin <ldv@altlinux.org> + * tst-tls6.sh: Add "set -e". + * Makefile: Do not specify -e option when running testsuite + shell scripts. + * tst-tls6.sh: Add copyright header. 2012-09-24 H.J. Lu <hongjiu.lu@intel.com> diff --git a/nptl/Makefile b/nptl/Makefile index 6f2b66c303..b081b07955 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2008,2009,2010,2012 Free Software Foundation, Inc. +# Copyright (C) 2002-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 @@ -472,7 +472,7 @@ $(objpfx)tst-tls6.out: tst-tls6.sh $(objpfx)tst-tls5 \ $(objpfx)tst-tls5moda.so $(objpfx)tst-tls5modb.so \ $(objpfx)tst-tls5modc.so $(objpfx)tst-tls5modd.so \ $(objpfx)tst-tls5mode.so $(objpfx)tst-tls5modf.so - $(SHELL) -e tst-tls6.sh $(common-objpfx) $(elf-objpfx) \ + $(SHELL) $< $(common-objpfx) $(elf-objpfx) \ $(rtld-installed-name) endif diff --git a/nptl/tst-tls6.sh b/nptl/tst-tls6.sh index 9c334fa8b3..2622e33859 100755 --- a/nptl/tst-tls6.sh +++ b/nptl/tst-tls6.sh @@ -1,6 +1,6 @@ #! /bin/sh # A tls test. -# Copyright (C) 2003 Free Software Foundation, Inc. +# Copyright (C) 2003-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 # <http://www.gnu.org/licenses/>. +set -e + common_objpfx=$1; shift elf_objpfx=$1; shift rtld_installed_name=$1; shift diff --git a/posix/Makefile b/posix/Makefile index 3560bb2c30..a4741849e5 100644 --- a/posix/Makefile +++ b/posix/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1991-2007,2009,2010,2011,2012 Free Software Foundation, Inc. +# Copyright (C) 1991-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 @@ -117,10 +117,10 @@ ifeq (no,$(cross-compiling)) ifeq (yes,$(build-shared)) tests: $(objpfx)globtest.out $(objpfx)wordexp-tst.out $(objpfx)globtest.out: globtest.sh $(objpfx)globtest - $(SHELL) -e globtest.sh $(common-objpfx) $(elf-objpfx) \ + $(SHELL) $< $(common-objpfx) $(elf-objpfx) \ $(rtld-installed-name) $(objpfx)wordexp-tst.out: wordexp-tst.sh $(objpfx)wordexp-test - $(SHELL) -e wordexp-tst.sh $(common-objpfx) $(elf-objpfx) \ + $(SHELL) $< $(common-objpfx) $(elf-objpfx) \ $(rtld-installed-name) endif endif @@ -276,7 +276,7 @@ $(objpfx)tst-boost-mem: $(objpfx)tst-boost.out $(common-objpfx)malloc/mtrace $(objpfx)tst-boost.mtrace > $@ $(objpfx)tst-getconf.out: tst-getconf.sh $(objpfx)getconf - $(SHELL) -e $< $(common-objpfx) $(elf-objpfx) $(rtld-installed-name) + $(SHELL) $< $(common-objpfx) $(elf-objpfx) $(rtld-installed-name) ifeq (yes,$(build-shared)) $(objpfx)tst-regex: $(common-objpfx)rt/librt.so diff --git a/posix/globtest.sh b/posix/globtest.sh index 73f198db2f..286b1b4912 100755 --- a/posix/globtest.sh +++ b/posix/globtest.sh @@ -1,6 +1,6 @@ #! /bin/bash # Test for glob(3). -# Copyright (C) 1997-2011 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 # <http://www.gnu.org/licenses/>. +set -e + common_objpfx=$1; shift elf_objpfx=$1; shift rtld_installed_name=$1; shift diff --git a/posix/tst-getconf.sh b/posix/tst-getconf.sh index 499cd071bd..030926a74f 100644 --- a/posix/tst-getconf.sh +++ b/posix/tst-getconf.sh @@ -1,6 +1,6 @@ #! /bin/sh # Test for getconf(1). -# Copyright (C) 2001-2002 Free Software Foundation, Inc. +# Copyright (C) 2001-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 # <http://www.gnu.org/licenses/>. +set -e + common_objpfx=$1; shift elf_objpfx=$1; shift if [ $# -eq 0 ]; then diff --git a/posix/wordexp-tst.sh b/posix/wordexp-tst.sh index 53183e561d..fec529265b 100755 --- a/posix/wordexp-tst.sh +++ b/posix/wordexp-tst.sh @@ -1,6 +1,6 @@ #! /bin/sh # Test for wordexp(3). -# 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. # 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 # <http://www.gnu.org/licenses/>. +set -e + # Some of these tests may look a little weird. # The first parameter to wordexp-test is what it gives to wordexp. # The others are just there to be parameters. diff --git a/stdio-common/Makefile b/stdio-common/Makefile index 9811572431..0cdf6307ea 100644 --- a/stdio-common/Makefile +++ b/stdio-common/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1991-2009, 2011, 2012 Free Software Foundation, Inc. +# Copyright (C) 1991-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 @@ -68,12 +68,12 @@ ifeq ($(cross-compiling),no) tests: do-tst-unbputc do-tst-printf do-tst-unbputc: $(objpfx)tst-unbputc.out -$(objpfx)tst-unbputc.out: $(objpfx)tst-unbputc tst-unbputc.sh - $(SHELL) -e tst-unbputc.sh $(common-objpfx) '$(run-program-prefix)' +$(objpfx)tst-unbputc.out: tst-unbputc.sh $(objpfx)tst-unbputc + $(SHELL) $< $(common-objpfx) '$(run-program-prefix)' do-tst-printf: $(objpfx)tst-printf.out -$(objpfx)tst-printf.out: $(objpfx)tst-printf tst-printf.sh - $(SHELL) -e tst-printf.sh $(common-objpfx) '$(run-program-prefix)' +$(objpfx)tst-printf.out: tst-printf.sh $(objpfx)tst-printf + $(SHELL) $< $(common-objpfx) '$(run-program-prefix)' endif CFLAGS-vfprintf.c = -Wno-uninitialized diff --git a/stdio-common/tst-printf.sh b/stdio-common/tst-printf.sh index 43e42a8fdd..d39b55179b 100644 --- a/stdio-common/tst-printf.sh +++ b/stdio-common/tst-printf.sh @@ -1,8 +1,7 @@ #! /bin/sh # Testing of printf. -# Copyright (C) 2000, 2002, 2006 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 # <http://www.gnu.org/licenses/>. +set -e + common_objpfx=$1; shift run_program_prefix=$1; shift diff --git a/stdio-common/tst-unbputc.sh b/stdio-common/tst-unbputc.sh index fd650d4838..1f28d4d240 100755 --- a/stdio-common/tst-unbputc.sh +++ b/stdio-common/tst-unbputc.sh @@ -1,8 +1,7 @@ #! /bin/sh # Testing the stdio implementation -# 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 # <http://www.gnu.org/licenses/>. +set -e + common_objpfx=$1; shift run_program_prefix=$1; shift diff --git a/stdlib/Makefile b/stdlib/Makefile index c730b47433..a5318ee00b 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1991-2009, 2011, 2012 Free Software Foundation, Inc. +# Copyright (C) 1991-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 @@ -135,7 +135,7 @@ $(objpfx)isomac: isomac.c $(native-compile) $(objpfx)tst-fmtmsg.out: tst-fmtmsg.sh $(objpfx)tst-fmtmsg - $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' $(common-objpfx)stdlib/ + $(SHELL) $< $(common-objpfx) '$(run-program-prefix)' $(common-objpfx)stdlib/ $(objpfx)tst-putenv: $(objpfx)tst-putenvmod.so LDFLAGS-tst-putenv = $(no-as-needed) diff --git a/stdlib/tst-fmtmsg.sh b/stdlib/tst-fmtmsg.sh index abde254e06..868292eba2 100755 --- a/stdlib/tst-fmtmsg.sh +++ b/stdlib/tst-fmtmsg.sh @@ -1,8 +1,7 @@ #! /bin/sh # Test of fmtmsg function family. -# Copyright (C) 2000, 2001 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 # <http://www.gnu.org/licenses/>. +set -e + common_objpfx=$1 run_program_prefix=$2 objpfx=$3 diff --git a/sysdeps/x86_64/Makefile b/sysdeps/x86_64/Makefile index d4525bc7c0..0acb69a17f 100644 --- a/sysdeps/x86_64/Makefile +++ b/sysdeps/x86_64/Makefile @@ -41,7 +41,7 @@ $(objpfx)tst-quad2pie: $(objpfx)tst-quadmod2pie.o tests: $(objpfx)tst-xmmymm.out $(objpfx)tst-xmmymm.out: ../sysdeps/x86_64/tst-xmmymm.sh $(objpfx)ld.so @echo "Checking ld.so for SSE register use. This will take a few seconds..." - $(SHELL) -e $< $(objpfx) > $@ + $(SHELL) $< $(objpfx) > $@ endif ifeq ($(subdir),csu) diff --git a/sysdeps/x86_64/tst-xmmymm.sh b/sysdeps/x86_64/tst-xmmymm.sh index edb58b1e91..64efc6e021 100755 --- a/sysdeps/x86_64/tst-xmmymm.sh +++ b/sysdeps/x86_64/tst-xmmymm.sh @@ -1,6 +1,6 @@ #! /bin/bash # Make sure no code in ld.so uses xmm/ymm registers on x86-64. -# Copyright (C) 2009 Free Software Foundation, Inc. +# Copyright (C) 2009-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 # <http://www.gnu.org/licenses/>. +set -e + objpfx="$1" tmp=$(mktemp ${objpfx}tst-xmmymm.XXXXXX) |