public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc/azanella/y2038] Add tests-container-internal rules
@ 2021-03-04 11:29 Adhemerval Zanella
0 siblings, 0 replies; 8+ messages in thread
From: Adhemerval Zanella @ 2021-03-04 11:29 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=d253f95a2d38d55f52bacf725ceb20e2d85447d4
commit d253f95a2d38d55f52bacf725ceb20e2d85447d4
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
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) > $@; \
^ permalink raw reply [flat|nested] 8+ messages in thread
* [glibc/azanella/y2038] Add tests-container-internal rules
@ 2021-03-05 19:19 Adhemerval Zanella
0 siblings, 0 replies; 8+ messages in thread
From: Adhemerval Zanella @ 2021-03-05 19:19 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=9e204b424df16b57dac520638d688da1109c3bf1
commit 9e204b424df16b57dac520638d688da1109c3bf1
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
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) > $@; \
^ permalink raw reply [flat|nested] 8+ messages in thread
* [glibc/azanella/y2038] Add tests-container-internal rules
@ 2021-03-04 17:36 Adhemerval Zanella
0 siblings, 0 replies; 8+ messages in thread
From: Adhemerval Zanella @ 2021-03-04 17:36 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=d253f95a2d38d55f52bacf725ceb20e2d85447d4
commit d253f95a2d38d55f52bacf725ceb20e2d85447d4
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
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) > $@; \
^ permalink raw reply [flat|nested] 8+ messages in thread
* [glibc/azanella/y2038] Add tests-container-internal rules
@ 2021-03-02 12:30 Adhemerval Zanella
0 siblings, 0 replies; 8+ messages in thread
From: Adhemerval Zanella @ 2021-03-02 12:30 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=d9c3183e9463807abf8add8280fa335a76c2f654
commit d9c3183e9463807abf8add8280fa335a76c2f654
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
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) > $@; \
^ permalink raw reply [flat|nested] 8+ messages in thread
* [glibc/azanella/y2038] Add tests-container-internal rules
@ 2021-03-01 17:35 Adhemerval Zanella
0 siblings, 0 replies; 8+ messages in thread
From: Adhemerval Zanella @ 2021-03-01 17:35 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=5487b5cddc5cb84f9d582173f066ae3706baaba9
commit 5487b5cddc5cb84f9d582173f066ae3706baaba9
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
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) > $@; \
^ permalink raw reply [flat|nested] 8+ messages in thread
* [glibc/azanella/y2038] Add tests-container-internal rules
@ 2021-02-26 20:41 Adhemerval Zanella
0 siblings, 0 replies; 8+ messages in thread
From: Adhemerval Zanella @ 2021-02-26 20:41 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=99bf7f29424f34340bcdea6472f9e7d12c8c06bb
commit 99bf7f29424f34340bcdea6472f9e7d12c8c06bb
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
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) > $@; \
^ permalink raw reply [flat|nested] 8+ messages in thread
* [glibc/azanella/y2038] Add tests-container-internal rules
@ 2021-02-23 20:39 Adhemerval Zanella
0 siblings, 0 replies; 8+ messages in thread
From: Adhemerval Zanella @ 2021-02-23 20:39 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=4e7b6195480823c69977d9d58aae359fa2caf8b9
commit 4e7b6195480823c69977d9d58aae359fa2caf8b9
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
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) > $@; \
^ permalink raw reply [flat|nested] 8+ messages in thread
* [glibc/azanella/y2038] Add tests-container-internal rules
@ 2021-02-23 12:37 Adhemerval Zanella
0 siblings, 0 replies; 8+ messages in thread
From: Adhemerval Zanella @ 2021-02-23 12:37 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=562639fbc857f27300b3adcaa59c1155922c6e71
commit 562639fbc857f27300b3adcaa59c1155922c6e71
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
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) > $@; \
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-03-05 19:19 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-04 11:29 [glibc/azanella/y2038] Add tests-container-internal rules Adhemerval Zanella
-- strict thread matches above, loose matches on Subject: below --
2021-03-05 19:19 Adhemerval Zanella
2021-03-04 17:36 Adhemerval Zanella
2021-03-02 12:30 Adhemerval Zanella
2021-03-01 17:35 Adhemerval Zanella
2021-02-26 20:41 Adhemerval Zanella
2021-02-23 20:39 Adhemerval Zanella
2021-02-23 12:37 Adhemerval Zanella
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).