From patchwork Thu Oct 1 14:14:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Schwab X-Patchwork-Id: 40575 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 71B4E398680D; Thu, 1 Oct 2020 14:14:43 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by sourceware.org (Postfix) with ESMTPS id 3F42B398680D for ; Thu, 1 Oct 2020 14:14:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 3F42B398680D Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=schwab@suse.de X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 4BBB4ADF7 for ; Thu, 1 Oct 2020 14:14:39 +0000 (UTC) From: Andreas Schwab To: libc-alpha@sourceware.org Subject: [PATCH] Revert "Fix missing redirects in testsuite targets" X-Yow: Hiccuping & trembling into the WASTE DUMPS of New Jersey like some drunken CABBAGE PATCH DOLL, coughing in line at FIORUCCI'S!! Date: Thu, 01 Oct 2020 16:14:39 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Spam-Status: No, score=-8.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" This reverts commit d5afb38503. The log files are actually created by the various shell scripts that drive the tests. --- elf/Makefile | 2 +- grp/Makefile | 2 +- intl/Makefile | 10 +++++----- libio/Makefile | 2 +- localedata/Makefile | 4 ++-- malloc/Makefile | 2 +- nptl/Makefile | 2 +- posix/Makefile | 6 +++--- stdio-common/Makefile | 4 ++-- stdlib/Makefile | 4 ++-- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/elf/Makefile b/elf/Makefile index c587e9f06e..75994888bd 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -947,7 +947,7 @@ $(objpfx)tst-pathopt: $(libdl) $(objpfx)tst-pathopt.out: tst-pathopt.sh $(objpfx)tst-pathopt \ $(objpfx)pathoptobj.so $(SHELL) $< $(common-objpfx) '$(test-wrapper-env)' \ - '$(run-program-env)' > $@; \ + '$(run-program-env)'; \ $(evaluate-test) $(objpfx)tst-rtld-load-self.out: tst-rtld-load-self.sh $(objpfx)ld.so diff --git a/grp/Makefile b/grp/Makefile index 34fceb628f..9d1dae91db 100644 --- a/grp/Makefile +++ b/grp/Makefile @@ -59,7 +59,7 @@ ifeq ($(run-built-tests),yes) # tst_fgetgrent currently only works with shared libraries ifeq (yes,$(build-shared)) $(objpfx)tst_fgetgrent.out: tst_fgetgrent.sh $(objpfx)tst_fgetgrent - $(SHELL) $< $(common-objpfx) '$(test-program-prefix)' > $@; \ + $(SHELL) $< $(common-objpfx) '$(test-program-prefix)'; \ $(evaluate-test) endif diff --git a/intl/Makefile b/intl/Makefile index ce3072420f..3195cb54ad 100644 --- a/intl/Makefile +++ b/intl/Makefile @@ -83,22 +83,22 @@ $(objpfx)mtrace-tst-gettext.out: $(objpfx)tst-gettext.out $(objpfx)tst-gettext.out: tst-gettext.sh $(objpfx)tst-gettext $(SHELL) $< $(common-objpfx) '$(test-program-prefix-before-env)' \ '$(run-program-env)' '$(test-program-prefix-after-env)' \ - $(common-objpfx)intl/ $(objpfx)tst-gettext.mtrace > $@; \ + $(common-objpfx)intl/ $(objpfx)tst-gettext.mtrace; \ $(evaluate-test) $(objpfx)tst-translit.out: tst-translit.sh $(objpfx)tst-translit $(SHELL) $< $(common-objpfx) '$(test-program-prefix)' \ - $(common-objpfx)intl/ > $@; \ + $(common-objpfx)intl/; \ $(evaluate-test) $(objpfx)tst-gettext2.out: tst-gettext2.sh $(objpfx)tst-gettext2 $(SHELL) $< $(common-objpfx) '$(test-program-prefix-before-env)' \ '$(run-program-env)' '$(test-program-prefix-after-env)' \ - $(common-objpfx)intl/ > $@; \ + $(common-objpfx)intl/; \ $(evaluate-test) $(objpfx)tst-gettext4.out: tst-gettext4.sh $(objpfx)tst-gettext4 - $(SHELL) $< $(common-objpfx) '$(test-program-prefix)' $(common-objpfx)intl/ > $@; \ + $(SHELL) $< $(common-objpfx) '$(test-program-prefix)' $(common-objpfx)intl/; \ $(evaluate-test) $(objpfx)tst-gettext6.out: tst-gettext6.sh $(objpfx)tst-gettext6 - $(SHELL) $< $(common-objpfx) '$(test-program-prefix)' $(common-objpfx)intl/ > $@; \ + $(SHELL) $< $(common-objpfx) '$(test-program-prefix)' $(common-objpfx)intl/; \ $(evaluate-test) $(objpfx)tst-codeset.out: $(codeset_mo) diff --git a/libio/Makefile b/libio/Makefile index 4a344d686d..d732e2c340 100644 --- a/libio/Makefile +++ b/libio/Makefile @@ -227,7 +227,7 @@ endif $(objpfx)test-freopen.out: test-freopen.sh $(objpfx)test-freopen $(SHELL) $< $(common-objpfx) '$(test-program-prefix)' \ - $(common-objpfx)libio/ > $@; \ + $(common-objpfx)libio/; \ $(evaluate-test) $(objpfx)tst-fopenloc-cmp.out: ../iconvdata/testdata/ISO-8859-1..UTF8 \ diff --git a/localedata/Makefile b/localedata/Makefile index ccfcb0049f..a2854e03f3 100644 --- a/localedata/Makefile +++ b/localedata/Makefile @@ -361,13 +361,13 @@ $(objpfx)tst-trans.out: tst-trans.sh $(objpfx)tst-trans \ $(SHELL) $< $(common-objpfx) '$(run-program-prefix-before-env)' \ '$(run-program-env)' '$(run-program-prefix-after-env)' \ '$(test-program-prefix-before-env)' \ - '$(test-program-prefix-after-env)' > $@; \ + '$(test-program-prefix-after-env)'; \ $(evaluate-test) $(objpfx)tst-ctype.out: tst-ctype.sh $(objpfx)tst-ctype \ $(objpfx)sort-test.out \ $(addprefix $(objpfx),$(CTYPE_FILES)) $(SHELL) $< $(common-objpfx) '$(test-program-cmd-before-env)' \ - '$(run-program-env)' '$(test-program-cmd-after-env)' > $@; \ + '$(run-program-env)' '$(test-program-cmd-after-env)'; \ $(evaluate-test) $(objpfx)tst-langinfo-newlocale.out: tst-langinfo.sh \ $(objpfx)tst-langinfo-newlocale \ diff --git a/malloc/Makefile b/malloc/Makefile index 09ae63bee5..ab64dcfd73 100644 --- a/malloc/Makefile +++ b/malloc/Makefile @@ -185,7 +185,7 @@ ifeq (yes,$(build-shared)) ifneq ($(PERL),no) $(objpfx)tst-mtrace.out: tst-mtrace.sh $(objpfx)tst-mtrace $(SHELL) $< $(common-objpfx) '$(test-program-prefix-before-env)' \ - '$(run-program-env)' '$(test-program-prefix-after-env)' > $@; \ + '$(run-program-env)' '$(test-program-prefix-after-env)'; \ $(evaluate-test) endif endif diff --git a/nptl/Makefile b/nptl/Makefile index b30d263ca4..d47e8a81d9 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -518,7 +518,7 @@ $(objpfx)tst-tls6.out: tst-tls6.sh $(objpfx)tst-tls5 \ $(objpfx)tst-tls5modc.so $(objpfx)tst-tls5modd.so \ $(objpfx)tst-tls5mode.so $(objpfx)tst-tls5modf.so $(BASH) $< $(common-objpfx) '$(test-via-rtld-prefix)' \ - '$(test-wrapper-env)' '$(run-program-env)' > $@; \ + '$(test-wrapper-env)' '$(run-program-env)'; \ $(evaluate-test) endif diff --git a/posix/Makefile b/posix/Makefile index 19a890742a..1cc214dec7 100644 --- a/posix/Makefile +++ b/posix/Makefile @@ -164,11 +164,11 @@ ifeq ($(run-built-tests),yes) ifeq (yes,$(build-shared)) $(objpfx)globtest.out: globtest.sh $(objpfx)globtest $(SHELL) $< $(common-objpfx) '$(test-via-rtld-prefix)' \ - '$(test-program-prefix)' '$(test-wrapper-env)' > $@; \ + '$(test-program-prefix)' '$(test-wrapper-env)'; \ $(evaluate-test) $(objpfx)wordexp-tst.out: wordexp-tst.sh $(objpfx)wordexp-test $(SHELL) $< $(common-objpfx) '$(test-program-prefix-before-env)' \ - '$(run-program-env)' '$(test-program-prefix-after-env)' > $@; \ + '$(run-program-env)' '$(test-program-prefix-after-env)'; \ $(evaluate-test) endif @@ -354,7 +354,7 @@ $(objpfx)tst-boost-mem.out: $(objpfx)tst-boost.out $(evaluate-test) $(objpfx)tst-getconf.out: tst-getconf.sh $(objpfx)getconf - $(SHELL) $< $(common-objpfx) '$(built-program-cmd)' > $@; \ + $(SHELL) $< $(common-objpfx) '$(built-program-cmd)'; \ $(evaluate-test) $(objpfx)bug-ga2-mem.out: $(objpfx)bug-ga2.out diff --git a/stdio-common/Makefile b/stdio-common/Makefile index eff0c98d82..686f92a0f3 100644 --- a/stdio-common/Makefile +++ b/stdio-common/Makefile @@ -121,11 +121,11 @@ tst-printf-fp-leak-ENV = \ MALLOC_TRACE=$(objpfx)tst-printf-fp-leak.mtrace $(objpfx)tst-unbputc.out: tst-unbputc.sh $(objpfx)tst-unbputc - $(SHELL) $< $(common-objpfx) '$(test-program-prefix)' > $@; \ + $(SHELL) $< $(common-objpfx) '$(test-program-prefix)'; \ $(evaluate-test) $(objpfx)tst-printf.out: tst-printf.sh $(objpfx)tst-printf - $(SHELL) $< $(common-objpfx) '$(test-program-prefix)' > $@; \ + $(SHELL) $< $(common-objpfx) '$(test-program-prefix)'; \ $(evaluate-test) $(objpfx)tst-printfsz-islongdouble.out: \ diff --git a/stdlib/Makefile b/stdlib/Makefile index 4615f6dfe7..f8a1660186 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -208,7 +208,7 @@ $(objpfx)isomac: isomac.c $(objpfx)tst-fmtmsg.out: tst-fmtmsg.sh $(objpfx)tst-fmtmsg $(SHELL) $< $(common-objpfx) '$(test-program-prefix-before-env)' \ '$(run-program-env)' '$(test-program-prefix-after-env)' \ - $(common-objpfx)stdlib/ > $@; \ + $(common-objpfx)stdlib/; \ $(evaluate-test) $(objpfx)tst-putenv: $(objpfx)tst-putenvmod.so @@ -239,7 +239,7 @@ $(objpfx)tst-tls-atexit-nodelete.out: $(objpfx)tst-tls-atexit-lib.so $(objpfx)tst-setcontext3.out: tst-setcontext3.sh $(objpfx)tst-setcontext3 $(SHELL) $< $(common-objpfx) '$(test-program-prefix-before-env)' \ '$(run-program-env)' '$(test-program-prefix-after-env)' \ - $(common-objpfx)stdlib/ > $@; \ + $(common-objpfx)stdlib/; \ $(evaluate-test) $(objpfx)tst-makecontext: $(libdl)