Skip to content

Commit c54e029

Browse files
committed
tests/{linux,xml,x86,x86+linux,linux/allowed}: allow to run tests in an optional extra subdirectory
If extra/extra-tests.sh exists, call it with our TEST_LOG_COMPILER as parameter. Useful for additional testing that we can't or don't want to put in the repo (confidential, huge files, ...). Mostly useful for x86 and linux but supporting others is easy. Contrary to #191, this does not touch automake stuff at all, everything is managed by the outside subdirectory script (which basically iterates over tests and pass them to out TEST_LOG_COMPILER). Closes #191 Signed-off-by: Brice Goglin <[email protected]>
1 parent f2724bb commit c54e029

File tree

5 files changed

+15
-0
lines changed

5 files changed

+15
-0
lines changed

tests/hwloc/linux/Makefile.am

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,4 +171,7 @@ EXTRA_DIST = $(sysfs_tests) $(sysfs_tarballs) $(sysfs_console_outputs) $(sysfs_x
171171
# variables prefixed with TEST_
172172
TEST_LOG_COMPILER = $(abs_builddir)/test-topology.sh
173173

174+
check-local:
175+
if test -x extra/extra-tests.sh; then extra/extra-tests.sh "$(TEST_LOG_COMPILER)"; fi
176+
174177
SUBDIRS = . allowed gather

tests/hwloc/linux/allowed/Makefile.am

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,6 @@ EXTRA_DIST = $(allowed_tests) $(allowed_outputs) $(allowed_fsroots)
2525
# .test is in TEXT_EXTENSIONS by default, hence it uses its own test configuration
2626
# variables prefixed with TEST_
2727
TEST_LOG_COMPILER = $(abs_builddir)/test-topology.sh
28+
29+
check-local:
30+
if test -x extra/extra-tests.sh; then extra/extra-tests.sh "$(TEST_LOG_COMPILER)"; fi

tests/hwloc/x86+linux/Makefile.am

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,6 @@ EXTRA_DIST = $(cpuid_sysfs_tests) $(cpuid_sysfs_outputs) $(cpuid_sysfs_tarballs)
3333
# .test is in TEXT_EXTENSIONS by default, hence it uses its own test configuration
3434
# variables prefixed with TEST_
3535
TEST_LOG_COMPILER = $(abs_builddir)/test-topology.sh
36+
37+
check-local:
38+
if test -x extra/extra-tests.sh; then extra/extra-tests.sh "$(TEST_LOG_COMPILER)"; fi

tests/hwloc/x86/Makefile.am

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,3 +105,6 @@ EXTRA_DIST = $(cpuid_tests) $(cpuid_xml_outputs) $(cpuid_tarballs)
105105
# .test is in TEXT_EXTENSIONS by default, hence it uses its own test configuration
106106
# variables prefixed with TEST_
107107
TEST_LOG_COMPILER = $(abs_builddir)/test-topology.sh
108+
109+
check-local:
110+
if test -x extra/extra-tests.sh; then extra/extra-tests.sh "$(TEST_LOG_COMPILER)"; fi

tests/hwloc/xml/Makefile.am

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,6 @@ EXTRA_DIST = $(xml_tests) $(xml_xml_outputs) $(xml_console_outputs)
7979
# .test is in TEXT_EXTENSIONS by default, hence it uses its own test configuration
8080
# variables prefixed with TEST_
8181
TEST_LOG_COMPILER = $(abs_builddir)/test-topology.sh
82+
83+
check-local:
84+
if test -x extra/extra-tests.sh; then extra/extra-tests.sh "$(TEST_LOG_COMPILER)"; fi

0 commit comments

Comments
 (0)