Merge branch 'master' into i486

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
-