From patchwork Fri Mar 5 20:14:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 42301 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 3D01C399C034; Fri, 5 Mar 2021 20:15:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3D01C399C034 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1614975348; bh=mgfKBAPGLXEa9oY6OHVGqh5VKmcvjDDIEBIglONCiXs=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=ojp2UXAk5ZhAHLoTbsCp6f3yibVS+PSTsy+1XrxjnCRdnvljQYVwr04U26ml5xMDx o6+rD4wc6nCquHVtRfifssBzhZXd1J9GZDtfF8vQeoDk0SfDdPtSgDVmap28gQCTul xO+FgRz0TIo0X/o4eMade/wZmbSdZRDHxDLgXbek= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qv1-xf2e.google.com (mail-qv1-xf2e.google.com [IPv6:2607:f8b0:4864:20::f2e]) by sourceware.org (Postfix) with ESMTPS id C0054399C029 for ; Fri, 5 Mar 2021 20:15:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org C0054399C029 Received: by mail-qv1-xf2e.google.com with SMTP id gi9so1616020qvb.10 for ; Fri, 05 Mar 2021 12:15:45 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mgfKBAPGLXEa9oY6OHVGqh5VKmcvjDDIEBIglONCiXs=; b=YwElbsbbM7QUtC+6LMvctY7wD7ZJyg71hwWFqNjkYmnOktatzwU4SIYlkxlkjpKg7n G/2SQQNIP9g/gn4JClBlaszI2yiqvtFKevNaosAcxXemzVICu4wPH7pUI4LJJLrZPF1c E5Ft/9wEqwtK3CRrSGLQJWHh1L7UMoq/dKoiJ8WLADmf7tvu7ZDHQJSf11V5UPNVCike Xm0LoDDbb1lyq+CQJbBsNlOfNWi/mQdHieAMjleTM3mw9UFFeZjTZcUFsnMV38y5TQKK 1mY77gdjNaAKaotuoHqCqhvUQ+EOv67x7jfzhysdHcAwstoDh/GL2i9Ve0FFYNYxMEcH /0pA== X-Gm-Message-State: AOAM531SiGCSL8lEyQINFPXsxEPVKxwzM7uIeCEAaAz5ynZKtjJTKbYQ YSCq+FvBmswkd5J7XEuHypv5GZlGw/TTnA== X-Google-Smtp-Source: ABdhPJxpcoGzeXIMOACs45h/RWIciNJ3d/4iFya8PkE2+wdEPBzgwbts1UlRDa9AchvOfmizcwiPsA== X-Received: by 2002:a0c:c1cc:: with SMTP id v12mr10206630qvh.47.1614975345112; Fri, 05 Mar 2021 12:15:45 -0800 (PST) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id c5sm2526145qkl.21.2021.03.05.12.15.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 12:15:44 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH 19/52] Add tests-container-internal rules Date: Fri, 5 Mar 2021 17:14:45 -0300 Message-Id: <20210305201518.798584-20-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210305201518.798584-1-adhemerval.zanella@linaro.org> References: <20210305201518.798584-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, 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: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" It is similar to test-container, but build with -MODULE_NAME=nonlib (similar to test-internal). --- 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) > $@; \