diff options
| author | Matthias Kretz <kretz@kde.org> | 2021-02-03 15:49:29 +0000 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2021-02-03 15:49:29 +0000 |
| commit | b27ea896dd73a9065771e3e8c2fcdc69af80e186 (patch) | |
| tree | 3361972b3d372512681bb1b12baef1f9cef1cd7c | |
| parent | 471b19334842a13afc9ef16a9055e030ae2c9d5d (diff) | |
| download | gcc-b27ea896dd73a9065771e3e8c2fcdc69af80e186.zip gcc-b27ea896dd73a9065771e3e8c2fcdc69af80e186.tar.gz gcc-b27ea896dd73a9065771e3e8c2fcdc69af80e186.tar.bz2 | |
libstdc++: Fix DRIVEROPTS and TESTFLAGS processing
libstdc++-v3/ChangeLog:
* testsuite/experimental/simd/generate_makefile.sh: Use
different variables internally than documented for user
overrides. This makes internal append/prepend work as intended.
| -rwxr-xr-x | libstdc++-v3/testsuite/experimental/simd/generate_makefile.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libstdc++-v3/testsuite/experimental/simd/generate_makefile.sh b/libstdc++-v3/testsuite/experimental/simd/generate_makefile.sh index 8d642a2..4fb710c 100755 --- a/libstdc++-v3/testsuite/experimental/simd/generate_makefile.sh +++ b/libstdc++-v3/testsuite/experimental/simd/generate_makefile.sh @@ -85,19 +85,20 @@ CXX="$1" shift echo "TESTFLAGS ?=" > "$dst" -[ -n "$testflags" ] && echo "TESTFLAGS := $testflags \$(TESTFLAGS)" >> "$dst" -echo CXXFLAGS = "$@" "\$(TESTFLAGS)" >> "$dst" +echo "test_flags := $testflags \$(TESTFLAGS)" >> "$dst" +echo CXXFLAGS = "$@" "\$(test_flags)" >> "$dst" [ -n "$sim" ] && echo "export GCC_TEST_SIMULATOR = $sim" >> "$dst" cat >> "$dst" <<EOF srcdir = ${srcdir} CXX = ${CXX} DRIVER = ${driver} DRIVEROPTS ?= +driveroptions := \$(DRIVEROPTS) all: simd_testsuite.sum simd_testsuite.sum: simd_testsuite.log - @printf "\n\t\t=== simd_testsuite \$(TESTFLAGS) Summary ===\n\n"\\ + @printf "\n\t\t=== simd_testsuite \$(test_flags) Summary ===\n\n"\\ "# of expected passes:\t\t\$(shell grep -c '^PASS:' \$@)\n"\\ "# of unexpected passes:\t\t\$(shell grep -c '^XPASS:' \$@)\n"\\ "# of unexpected failures:\t\$(shell grep -c '^FAIL:' \$@)\n"\\ @@ -247,14 +248,14 @@ EOF for i in $(seq 0 9); do cat <<EOF %-$type-$i.log: \$(srcdir)/%.cc - @\$(DRIVER) \$(DRIVEROPTS) -t "$t" -a $i -n \$* \$(CXX) \$(CXXFLAGS) + @\$(DRIVER) \$(driveroptions) -t "$t" -a $i -n \$* \$(CXX) \$(CXXFLAGS) EOF done done cat <<EOF run-%: export GCC_TEST_RUN_EXPENSIVE=yes -run-%: DRIVEROPTS=-v +run-%: driveroptions += -v run-%: %.log @rm \$^ \$(^:log=sum) |