From 1bd0ea10badb502631161b535c94d8a69a50834a Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Mon, 22 Oct 2018 20:23:42 +0200
Subject: extra/python2: disable xvfb stuff on i486

---
 extra/python2/PKGBUILD | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD
index c93cac57..519a683a 100644
--- a/extra/python2/PKGBUILD
+++ b/extra/python2/PKGBUILD
@@ -30,3 +30,16 @@ eval "$(
       s/ -m test.regrtest/ -m test.regrtest -j1/
     "
 )"
+
+makedepends=(${makedepends[@]//xorg-server-xvfb/})
+makedepends_i686=(xorg-server-xvfb)
+
+# skip xvfb stuff on i486
+if [ "$CARCH" = 'i486' ]; then
+  eval "$(
+    declare -f check | \
+      sed '
+        s/xvfb-run //
+      '
+  )"
+fi
-- 
cgit v1.2.3-70-g09d2


From e347602e5ccee2d414a32e6773b4b6dfb76303b3 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Mon, 22 Oct 2018 20:31:07 +0200
Subject: extra/python2: cleanup

---
 extra/python2/PKGBUILD | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD
index 519a683a..5b876d5a 100644
--- a/extra/python2/PKGBUILD
+++ b/extra/python2/PKGBUILD
@@ -3,32 +3,20 @@
 # 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/
-    "
+    '
 )"
 
 makedepends=(${makedepends[@]//xorg-server-xvfb/})
-- 
cgit v1.2.3-70-g09d2