From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 7C61B393A43F; Mon, 1 Mar 2021 17:35:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7C61B393A43F Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/azanella/y2038] Add tests-container-internal rules X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/y2038 X-Git-Oldrev: 88a7f1f57731cd01677f900938863ab17766a121 X-Git-Newrev: 5487b5cddc5cb84f9d582173f066ae3706baaba9 Message-Id: <20210301173552.7C61B393A43F@sourceware.org> Date: Mon, 1 Mar 2021 17:35:52 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Mar 2021 17:35:52 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=5487b5cddc5cb84f9d582173f066ae3706baaba9 commit 5487b5cddc5cb84f9d582173f066ae3706baaba9 Author: Adhemerval Zanella Date: Mon Feb 22 16:59:10 2021 +0000 Add tests-container-internal rules It is similar to test-container, but build with -MODULE_NAME=nonlib (similar to test-internal). Diff: --- Makefile | 2 +- Makerules | 3 ++- Rules | 12 +++++++----- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 50f99ca611..71c7d8b5ec 100644 --- a/Makefile +++ b/Makefile @@ -589,7 +589,7 @@ else LINKS_DSO_PROGRAM = links-dso-program endif -$(tests-container) $(addsuffix /tests,$(subdirs)) : \ +$(tests-container) $(tests-container-internal) $(addsuffix /tests,$(subdirs)) : \ $(objpfx)testroot.pristine/install.stamp $(objpfx)testroot.pristine/install.stamp : test -d $(objpfx)testroot.pristine || \ diff --git a/Makerules b/Makerules index ca9885436e..fc5251ffad 100644 --- a/Makerules +++ b/Makerules @@ -1290,7 +1290,7 @@ xcheck: xtests # that almost all internal declarations from config.h, libc-symbols.h, and # include/*.h are not available to 'testsuite' code, but are to 'nonlib' code. all-testsuite := $(strip $(tests) $(xtests) $(test-srcs) $(test-extras) \ - $(tests-container)) + $(tests-container) $(tests-container-internal)) ifneq (,$(all-testsuite)) cpp-srcs-left = $(all-testsuite) lib := testsuite @@ -1298,6 +1298,7 @@ include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left)) endif all-nonlib := $(strip $(tests-internal) $(test-internal-extras) \ + $(tests-container-internal) \ $(others) $(others-extras)) ifneq (,$(all-nonlib)) cpp-srcs-left = $(all-nonlib) diff --git a/Rules b/Rules index 082625bb71..67c6f009e4 100644 --- a/Rules +++ b/Rules @@ -148,13 +148,15 @@ others: $(py-const) ifeq ($(run-built-tests),no) tests: $(addprefix $(objpfx),$(filter-out $(tests-unsupported), \ $(tests) $(tests-internal) \ - $(tests-container)) \ + $(tests-container) \ + $(tests-container-internal)) \ $(test-srcs)) $(tests-special) \ $(tests-printers-programs) xtests: tests $(xtests-special) else tests: $(tests:%=$(objpfx)%.out) $(tests-internal:%=$(objpfx)%.out) \ $(tests-container:%=$(objpfx)%.out) \ + $(tests-container-internal:%=$(objpfx)%.out) \ $(tests-mcheck:%=$(objpfx)%-mcheck.out) \ $(tests-special) $(tests-printers-out) xtests: tests $(xtests:%=$(objpfx)%.out) $(xtests-special) @@ -166,7 +168,7 @@ ifeq ($(run-built-tests),no) tests-expected = else tests-expected = $(tests) $(tests-internal) $(tests-printers) \ - $(tests-container) $(tests-mcheck:%=%-mcheck) + $(tests-container) $(tests-container-internal) $(tests-mcheck:%=%-mcheck) endif tests: $(..)scripts/merge-test-results.sh -s $(objpfx) $(subdir) \ @@ -180,7 +182,7 @@ xtests: ifeq ($(build-programs),yes) binaries-all-notests = $(others) $(sysdep-others) binaries-all-tests = $(tests) $(tests-internal) $(xtests) $(test-srcs) \ - $(tests-container) + $(tests-container) $(tests-container-internal) binaries-all = $(binaries-all-notests) $(binaries-all-tests) binaries-static-notests = $(others-static) binaries-static-tests = $(tests-static) $(xtests-static) @@ -289,8 +291,8 @@ $(objpfx)%.out: /dev/null $(objpfx)% # Make it 2nd arg for canned sequence. # Any tests that require an isolated container (filesystem, network # and pid namespaces) in which to run, should be added to -# tests-container. -$(tests-container:%=$(objpfx)%.out): $(objpfx)%.out : $(if $(wildcard $(objpfx)%.files),$(objpfx)%.files,/dev/null) $(objpfx)% +# tests-container or tests-container-internal. +$(tests-container:%=$(objpfx)%.out) $(tests-container-internal:%=$(objpfx)%.out): $(objpfx)%.out : $(if $(wildcard $(objpfx)%.files),$(objpfx)%.files,/dev/null) $(objpfx)% $(test-wrapper-env) $(run-program-env) $(run-via-rtld-prefix) \ $(common-objpfx)support/test-container env $(run-program-env) $($*-ENV) \ $(host-test-program-cmd) $($*-ARGS) > $@; \