diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2020-01-11 23:11:13 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2020-01-11 23:53:08 +0000 |
| commit | 12bfa1e4f9595dbbcbe0a442c6a63bc3ef890cc2 (patch) | |
| tree | fc7b3d8a1e445c341859881a07d643fa0944187e /eclass/tests | |
| parent | app-text/sigil: Drop 0.9.13 (diff) | |
| download | gentoo-12bfa1e4f9595dbbcbe0a442c6a63bc3ef890cc2.tar.gz gentoo-12bfa1e4f9595dbbcbe0a442c6a63bc3ef890cc2.tar.bz2 gentoo-12bfa1e4f9595dbbcbe0a442c6a63bc3ef890cc2.zip | |
toolchain.eclass: fix arch downgrade for gcc-10
The bug is in lexical comparison instead of version compare.
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'eclass/tests')
| -rwxr-xr-x | eclass/tests/toolchain.sh | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/eclass/tests/toolchain.sh b/eclass/tests/toolchain.sh index 56609aa180e4..1d05f6c126ba 100755 --- a/eclass/tests/toolchain.sh +++ b/eclass/tests/toolchain.sh @@ -12,6 +12,12 @@ source tests-common.sh inherit toolchain +# Ignore actually running version of gcc and fake new version +# to force downgrade test on all conditions below. +gcc-version() { + echo "99.99" +} + test_downgrade_arch_flags() { local exp msg ret=0 ver @@ -26,13 +32,14 @@ test_downgrade_arch_flags() { downgrade_arch_flags ${ver} if [[ ${CFLAGS} != ${exp} ]]; then - msg="Failure - Expected: \"${exp}\" Got: \"${CFLAGS}\"" + msg="Failure - Expected: \"${exp}\" Got: \"${CFLAGS}\" Ver: ${ver}" ret=1 fi tend ${ret} ${msg} } # ver expected given +test_downgrade_arch_flags 10 "-march=haswell" "-march=haswell" test_downgrade_arch_flags 4.9 "-march=haswell" "-march=haswell" test_downgrade_arch_flags 4.8 "-march=core-avx2" "-march=haswell" test_downgrade_arch_flags 4.7 "-march=core-avx2" "-march=haswell" @@ -64,6 +71,7 @@ test_downgrade_arch_flags 3.3 "-march=c3" "-march=c3-2" test_downgrade_arch_flags 4.5 "-march=garbage" "-march=garbage" +test_downgrade_arch_flags 10 "-mtune=intel" "-mtune=intel" test_downgrade_arch_flags 4.9 "-mtune=intel" "-mtune=intel" test_downgrade_arch_flags 4.8 "-mtune=generic" "-mtune=intel" test_downgrade_arch_flags 3.4 "" "-mtune=generic" @@ -74,9 +82,11 @@ test_downgrade_arch_flags 4.5 "-march=amdfam10 -mtune=generic" "-march=btver2 -m test_downgrade_arch_flags 3.3 "-march=k6-2" "-march=geode -mtune=barcelona" test_downgrade_arch_flags 3.4 "-march=k8" "-march=btver2 -mtune=generic" +test_downgrade_arch_flags 10 "-march=native" "-march=native" test_downgrade_arch_flags 4.2 "-march=native" "-march=native" test_downgrade_arch_flags 4.1 "-march=nocona" "-march=native" +test_downgrade_arch_flags 10 "-march=foo -mno-sha -mno-rtm -mno-avx2 -mno-avx -mno-sse4.1" "-march=foo -mno-sha -mno-rtm -mno-avx2 -mno-avx -mno-sse4.1" test_downgrade_arch_flags 4.9 "-march=foo -mno-sha -mno-rtm -mno-avx2 -mno-avx -mno-sse4.1" "-march=foo -mno-sha -mno-rtm -mno-avx2 -mno-avx -mno-sse4.1" test_downgrade_arch_flags 4.8 "-march=foo -mno-rtm -mno-avx2 -mno-avx -mno-sse4.1" "-march=foo -mno-sha -mno-rtm -mno-avx2 -mno-avx -mno-sse4.1" test_downgrade_arch_flags 4.7 "-march=foo -mno-avx2 -mno-avx -mno-sse4.1" "-march=foo -mno-sha -mno-rtm -mno-avx2 -mno-avx -mno-sse4.1" |