summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-01-21 10:06:49 +0100
committerErich Eckner <git@eckner.net>2019-01-21 10:06:49 +0100
commit6873ad01a3e88d4bf7380e2e51fd5a483f3f8e07 (patch)
tree8af5c272b6742d47c99a19d8500bb6f3717c2953
parenteb9e53e6fec356dba092d3163ede62c834f03fae (diff)
parente347602e5ccee2d414a32e6773b4b6dfb76303b3 (diff)
downloadpackages-6873ad01a3e88d4bf7380e2e51fd5a483f3f8e07.tar.xz
Merge branch 'master' into i486
-rw-r--r--extra/python2/PKGBUILD54
1 files changed, 10 insertions, 44 deletions
diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD
index 8dea0a15..5b876d5a 100644
--- a/extra/python2/PKGBUILD
+++ b/extra/python2/PKGBUILD
@@ -3,65 +3,31 @@
# test_unicode, test_userstring) segfault on i686
# test_bigrepeat (present in test_tuple) segfault on i686
+# tests run with -j4 per default effectively killing build slaves,
+# forcing single threaded execution of tests
+
eval "$(
declare -f build | \
sed '
/export OPT=/ s/";$/ -fwrapv";/
+ s/make/make EXTRATESTOPTS='"'"'-j 1'"'"' /
'
declare -f check | \
sed '
/xvfb-run/ s/-x test_idle/-x test_idle test_bytes test_str test_string test_unicode test_userstring test_tuple/
- '
-)"
-
-# tests run with -j4 per default effectively killing build slaves,
-# forcing single threaded execution of tests
-
-eval "$(
- declare -f build | \
- sed "
- s/make/make EXTRATESTOPTS='-j 1' /
- "
-)"
-
-eval "$(
- declare -f check | \
- sed "
s/ -m test.regrtest/ -m test.regrtest -j1/
- "
+ '
)"
-# i486-specific
-if [ "${CARCH}" = "i486" ]; then
- # remove dependency on most things, we want only a simple interpreter
- # a little bit smarter than a shell for building and code generation
- makedepends=(${makedepends[@]//tk/})
- makedepends=(${makedepends[@]//bluez-libs/})
- makedepends=(${makedepends[@]//llvm/})
+makedepends=(${makedepends[@]//xorg-server-xvfb/})
+makedepends_i686=(xorg-server-xvfb)
- # do not start X servers just for building software!
- checkdepends=(${checkdepends[@]//xorg-server-xvfb/})
- eval "$(
- declare -f build | \
- sed '
- /export servernum=99/,/done/d
- s/.*make/make/
- '
- )"
+# skip xvfb stuff on i486
+if [ "$CARCH" = 'i486' ]; then
eval "$(
declare -f check | \
sed '
- /export servernum=99/,/done/d
- s/xvfb-run//
- '
- )"
-
- # ignore even more tests
- eval "$(
- declare -f check | \
- sed '
- s/-v -uall -x/-v -uall -x test_gdb test_ssl test_urllib2net/
+ s/xvfb-run //
'
)"
fi
-