commit:     049927c0dc3152580db69e4c109f55315823bf3d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  2 23:49:46 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct  2 23:50:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=049927c0

dev-util/scons: skip irrelevant tests on non-amd64/x86

Work is ongoing upstream, it seems, too.

Closes: https://bugs.gentoo.org/757534
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/scons/scons-4.2.0-r1.ebuild | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/dev-util/scons/scons-4.2.0-r1.ebuild 
b/dev-util/scons/scons-4.2.0-r1.ebuild
index e5a5c863755..c87db3273b7 100644
--- a/dev-util/scons/scons-4.2.0-r1.ebuild
+++ b/dev-util/scons/scons-4.2.0-r1.ebuild
@@ -73,6 +73,24 @@ src_prepare() {
                        test/option/option-v.py
                        test/Interactive/version.py
                )
+
+               if ! use amd64 && ! use x86 ; then
+                       # These tests are currently broken on arm and other 
non-amd64/x86 platforms
+                       # Work seems to be ongoing in e.g. 
https://github.com/SCons/scons/pull/4022 to
+                       # better plumb up the MSVC tests for alternative arches.
+                       # Try again after 4.2.0.
+                       # See also: 
https://pairlist4.pair.net/pipermail/scons-users/2020-November/008452.html
+                       # bug #757534
+                       remove_tests+=(
+                               test/MSVS/vs-7.0-scc-files.py
+                               test/MSVS/vs-7.0-scc-legacy-files.py
+                               test/MSVS/vs-7.1-scc-files.py
+                               test/MSVS/vs-7.1-scc-legacy-files.py
+                               test/MSVS/vs-scc-files.py
+                               test/MSVS/vs-scc-legacy-files.py
+                       )
+               fi
+
                rm -r "${remove_tests[@]}" || die
        fi
 }

Reply via email to