]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
projects / thirdparty / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c4d1d1a)
Allow overriding EXPECT
authorChristophe Lyon <christophe.lyon@linaro.org>
Thu, 21 Dec 2023 10:51:10 +0000 (10:51 +0000)
committerChristophe Lyon <christophe.lyon@linaro.org>
Fri, 22 Dec 2023 10:24:56 +0000 (10:24 +0000)
While investigating possible race conditions in the GCC testsuites
caused by bufferization issues, I wanted to investigate workarounds
similar to GDB's READ1 [1], and I noticed it was not always possible
to override EXPECT when running 'make check'.

This patch adds the missing support in various Makefiles.

I was not able to test the patch for all the libraries updated here,
but I confirmed it works as intended/needed for libstdc++.

libatomic, libitm, libgomp already work as intended because their
Makefiles do not have:
MAKEOVERRIDES=

Tested on (native) aarch64-linux-gnu, confirmed the patch introduces
the behaviour I want in gcc, g++, gfortran and libstdc++.

I updated (but could not test) libgm2, libphobos, libquadmath and
libssp for consistency since their Makefiles have MAKEOVERRIDES=

libffi, libgo, libsanitizer seem to need a similar update, but they
are imported from their respective upstream repo, so should not be
patched here.

[1] https://github.com/bminor/binutils-gdb/blob/master/gdb/testsuite/README#L269

2023-12-21  Christophe Lyon  <christophe.lyon@linaro.org>

gcc/
* Makefile.in: Allow overriding EXEPCT.

libgm2/
* Makefile.am: Allow overriding EXEPCT.
* Makefile.in: Regenerate.

libphobos/
* Makefile.am: Allow overriding EXEPCT.
* Makefile.in: Regenerate.

libquadmath/
* Makefile.am: Allow overriding EXEPCT.
* Makefile.in: Regenerate.

libssp/
* Makefile.am: Allow overriding EXEPCT.
* Makefile.in: Regenerate.

libstdc++-v3/
* Makefile.am: Allow overriding EXEPCT.
* Makefile.in: Regenerate.

gcc/Makefile.in patch | blob | blame | history
libgm2/Makefile.am patch | blob | blame | history
libgm2/Makefile.in patch | blob | blame | history
libphobos/Makefile.am patch | blob | blame | history
libphobos/Makefile.in patch | blob | blame | history
libquadmath/Makefile.am patch | blob | blame | history
libquadmath/Makefile.in patch | blob | blame | history
libssp/Makefile.am patch | blob | blame | history
libssp/Makefile.in patch | blob | blame | history
libstdc++-v3/Makefile.am patch | blob | blame | history
libstdc++-v3/Makefile.in patch | blob | blame | history

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 754eceb23bbc84b3212bc5d29a07d96d285a0035..9373800018774baefe7c64bed783d8d9ce5c7736 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -4304,6 +4304,7 @@ $(lang_checks_parallel): site.exp
        vardots=`echo "$$variant" | sed 's,/,.,g'`; \
        $(MAKE) TESTSUITEDIR="testsuite.$$vardots" \
          RUNTESTFLAGS="--target_board=$$variant $(RUNTESTFLAGS)" \
+         EXPECT=$(EXPECT) \
          "$$target"
 
 TESTSUITEDIR = testsuite
@@ -4369,6 +4370,7 @@ $(lang_checks_parallelized): check-% : site.exp
          GCC_RUNTEST_PARALLELIZE_DIR=`${PWD_COMMAND}`/$(TESTSUITEDIR)/$(check_p_tool)-parallel ; \
          export GCC_RUNTEST_PARALLELIZE_DIR ; \
          $(MAKE) TESTSUITEDIR="$(TESTSUITEDIR)" RUNTESTFLAGS="$(RUNTESTFLAGS)" \
+           EXPECT=$(EXPECT) \
            check-parallel-$* \
            $(patsubst %,check-parallel-$*_%, $(check_p_subdirs)); \
          sums= ; logs= ; \
@@ -4387,6 +4389,7 @@ $(lang_checks_parallelized): check-% : site.exp
          rm -rf $(TESTSUITEDIR)/$*-parallel || true; \
        else \
          $(MAKE) TESTSUITEDIR="$(TESTSUITEDIR)" RUNTESTFLAGS="$(RUNTESTFLAGS)" \
+           EXPECT=$(EXPECT) \
            check_$*_parallelize= check-parallel-$*; \
        fi
 
diff --git a/libgm2/Makefile.am b/libgm2/Makefile.am
index d2eadfc51aafa07a74873bfc3e56e0cc4657426e..72391d01291790a4fa893e41039861e58dc04186 100644 (file)
--- a/libgm2/Makefile.am
+++ b/libgm2/Makefile.am
@@ -69,6 +69,7 @@ AM_MAKEFLAGS = \
        "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
        "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
         "CFLAGS_LONGDOUBLE=$(CFLAGS_LONGDOUBLE)" \
+       "EXPECT=$(EXPECT)" \
        "INSTALL=$(INSTALL)" \
        "INSTALL_DATA=$(INSTALL_DATA)" \
        "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
diff --git a/libgm2/Makefile.in b/libgm2/Makefile.in
index 5a96f98edc9ca849d3b17e377867befa2c3d89f8..4c30d2b034f46cc0b51a98a24a6c7f68773f43a4 100644 (file)
--- a/libgm2/Makefile.in
+++ b/libgm2/Makefile.in
@@ -371,6 +371,7 @@ AM_MAKEFLAGS = \
        "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
        "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
         "CFLAGS_LONGDOUBLE=$(CFLAGS_LONGDOUBLE)" \
+       "EXPECT=$(EXPECT)" \
        "INSTALL=$(INSTALL)" \
        "INSTALL_DATA=$(INSTALL_DATA)" \
        "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
diff --git a/libphobos/Makefile.am b/libphobos/Makefile.am
index d46cfef533e18f79f15c7356fe83e25e162d82ba..307c57c8b229e6b85d403166cf3f99bda9dd7e7c 100644 (file)
--- a/libphobos/Makefile.am
+++ b/libphobos/Makefile.am
@@ -38,6 +38,7 @@ AM_MAKEFLAGS = \
        "CXXFLAGS=$(CXXFLAGS)" \
        "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
        "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
+       "EXPECT=$(EXPECT)" \
        "GDC_FOR_TARGET=$(GDC_FOR_TARGET)" \
        "GDC=$(GDC)" \
        "GDCFLAGS=$(GDCFLAGS)" \
diff --git a/libphobos/Makefile.in b/libphobos/Makefile.in
index 8d62c31dab0d28013701a9f0df4c752426adf88b..eef750bc46e01f7f2d5871e37f51b9d7598d23e6 100644 (file)
--- a/libphobos/Makefile.in
+++ b/libphobos/Makefile.in
@@ -365,6 +365,7 @@ AM_MAKEFLAGS = \
        "CXXFLAGS=$(CXXFLAGS)" \
        "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
        "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
+       "EXPECT=$(EXPECT)" \
        "GDC_FOR_TARGET=$(GDC_FOR_TARGET)" \
        "GDC=$(GDC)" \
        "GDCFLAGS=$(GDCFLAGS)" \
diff --git a/libquadmath/Makefile.am b/libquadmath/Makefile.am
index 0d02c95e73848ab4bbcdfff57931d49c4a4f3b79..3ddebe14b93655e27e3c0bfb267719ca8e4a40bf 100644 (file)
--- a/libquadmath/Makefile.am
+++ b/libquadmath/Makefile.am
@@ -88,6 +88,7 @@ AM_MAKEFLAGS = \
        "CXXFLAGS=$(CXXFLAGS)" \
        "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
        "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
+       "EXPECT=$(EXPECT)" \
        "INSTALL=$(INSTALL)" \
        "INSTALL_DATA=$(INSTALL_DATA)" \
        "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
diff --git a/libquadmath/Makefile.in b/libquadmath/Makefile.in
index 068af559457e090f5bf2235d6a9cfe75d6c66527..06dca1534ffa900c82e0ce767a67f9880e470de8 100644 (file)
--- a/libquadmath/Makefile.in
+++ b/libquadmath/Makefile.in
@@ -512,6 +512,7 @@ AUTOMAKE_OPTIONS = foreign info-in-builddir
 @BUILD_LIBQUADMATH_TRUE@       "CXXFLAGS=$(CXXFLAGS)" \
 @BUILD_LIBQUADMATH_TRUE@       "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
 @BUILD_LIBQUADMATH_TRUE@       "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
+@BUILD_LIBQUADMATH_TRUE@       "EXPECT=$(EXPECT)" \
 @BUILD_LIBQUADMATH_TRUE@       "INSTALL=$(INSTALL)" \
 @BUILD_LIBQUADMATH_TRUE@       "INSTALL_DATA=$(INSTALL_DATA)" \
 @BUILD_LIBQUADMATH_TRUE@       "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
diff --git a/libssp/Makefile.am b/libssp/Makefile.am
index f7ed2aa6043a7a5ff0cddce12360ae8b24893f53..b1269489a8d4f644177559d552bdc21026e75c91 100644 (file)
--- a/libssp/Makefile.am
+++ b/libssp/Makefile.am
@@ -77,6 +77,7 @@ AM_MAKEFLAGS = \
        "CXXFLAGS=$(CXXFLAGS)" \
        "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
        "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
+       "EXPECT=$(EXPECT)" \
        "INSTALL=$(INSTALL)" \
        "INSTALL_DATA=$(INSTALL_DATA)" \
        "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
diff --git a/libssp/Makefile.in b/libssp/Makefile.in
index 1cf86361b96b0bb108d7bcd86ce9b24441055b02..168f620a1f88b0fcdae60959f77cb8c3f9fb6028 100644 (file)
--- a/libssp/Makefile.in
+++ b/libssp/Makefile.in
@@ -403,6 +403,7 @@ AM_MAKEFLAGS = \
        "CXXFLAGS=$(CXXFLAGS)" \
        "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
        "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
+       "EXPECT=$(EXPECT)" \
        "INSTALL=$(INSTALL)" \
        "INSTALL_DATA=$(INSTALL_DATA)" \
        "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
diff --git a/libstdc++-v3/Makefile.am b/libstdc++-v3/Makefile.am
index 5fbf393bfdf63b7095236bce610988405d93bb12..0ad40b69e4577b2106542a7bcbe293585663fe73 100644 (file)
--- a/libstdc++-v3/Makefile.am
+++ b/libstdc++-v3/Makefile.am
@@ -142,6 +142,7 @@ AM_MAKEFLAGS = \
        "CXXFLAGS=$(CXXFLAGS)" \
        "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
        "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
+       "EXPECT=$(EXPECT)" \
        "INSTALL=$(INSTALL)" \
        "INSTALL_DATA=$(INSTALL_DATA)" \
        "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in
index 500c0d752821d3a2416018eb99761d66aad57293..cf8dd8bca50fba0f8e0323d8e1ab29f52ad365cf 100644 (file)
--- a/libstdc++-v3/Makefile.in
+++ b/libstdc++-v3/Makefile.in
@@ -460,6 +460,7 @@ AM_MAKEFLAGS = \
        "CXXFLAGS=$(CXXFLAGS)" \
        "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
        "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
+       "EXPECT=$(EXPECT)" \
        "INSTALL=$(INSTALL)" \
        "INSTALL_DATA=$(INSTALL_DATA)" \
        "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
Mirror of https://gcc.gnu.org/git/gcc.git