testing/redo: fix test relying on tty

One test fails on the builders because it relies on a tty being present.
Upstream has fixed this test to not rely on a tty anymore, but this has
not been released yet.

Apply the commit from upstream as a patch until a new version has been
released.

The previous patch to fix it does not work, so remove it.

2 files changed, 16 insertions, 36 deletions

diff --git a/testing/redo/APKBUILD b/testing/redo/APKBUILD
index b7cc5b3dca..192687a8d5 100644
--- a/testing/redo/APKBUILD
+++ b/testing/redo/APKBUILD
@@ -2,39 +2,39 @@
 # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org>
 pkgname=redo
 pkgver=0.41
-pkgrel=2
+pkgrel=3
 pkgdesc="Smaller, easier, more powerful, and more reliable than make"
 url="https://redo.readthedocs.io/en/latest/"
-# arch="noarch"
+arch="noarch"
 license="Apache-2.0"
 depends="python2"
 makedepends="python2 perl"
 subpackages="$pkgname-doc"
 source="https://github.com/apenwarr/redo/archive/redo-${pkgver}.tar.gz
-        skip-when-tty-missing.patch"
+        builder-no-tty.patch::https://github.com/apenwarr/redo/commit/c18c4b92c9a2b23f0ce06d9aebf151bdaded6dd1.patch"
+	# Above patch can be removed once a new version has been released.
+
 builddir="$srcdir/redo-redo-${pkgver}"
 
 build() {
-	cd "$builddir"
-
-        ./do build
+	./do build
 }
 
 check() {
-	cd "$builddir"
-        ./do test
-
-        # Some files / directories are created as read-only for testing
-        # purposes. Make them writable again to make sure we can remove them
-        # again.
-        chmod -R +w .
+	./do test
 }
 
 package() {
-	cd "$builddir"
+	DESTDIR="$pkgdir" PREFIX="/usr" ./do install
+}
+
+cleanup_srcdir() {
+	# Test suite changes some files to read-only, resulting in errors on
+	# cleanup.
+	[ -e "$srcdir" ] && chmod -R a+w "$srcdir"
 
-        DESTDIR="$pkgdir" PREFIX="/usr" ./do install
+	default_cleanup_srcdir
 }
 
 sha512sums="94e4414a2f8120e5d4a949461734ed69dc2f39edfb7929d2efff83041ac0b941e037359ccfafcb4eff760608274e32c579df56d58fdb67b13b8a26eb1945b0d0  redo-0.41.tar.gz
-bc622d6a4b2c270f4f7791bb545d9f0a34a3c993f4a03dd901c4419c4f82ffeb43d210972f29abada14ba9eae812040c2c5a76ffdcfc744bb01fd5c32fa0ca89  skip-when-tty-missing.patch"
+ede8020f488023f4419dd044c689e76566493573356a224c56048caadf1e34ddb33e9f676085f92479515a64bedbbafa13cee286caa2e09aa56b3753762a0e65  builder-no-tty.patch"
diff --git a/testing/redo/skip-when-tty-missing.patch b/testing/redo/skip-when-tty-missing.patch
deleted file mode 100644
index 8acefbacd9..0000000000
--- a/testing/redo/skip-when-tty-missing.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/redo/builder.py b/redo/builder.py.new
-index e55955f7f9..160cba8dfe 100644
---- a/redo/builder.py
-+++ b/redo/builder.py.new
-@@ -1,5 +1,5 @@
- """Code for parallel-building a set of targets, if needed."""
--import errno, os, stat, signal, sys, tempfile, time
-+import errno, os, os.path, stat, signal, sys, tempfile, time
- from . import cycles, env, jobserver, logs, state, paths
- from .helpers import unlink, close_on_exec
- from .logs import debug2, err, warn, meta
-@@ -99,6 +99,8 @@ def await_log_reader():
-     if not env.v.LOG:
-         return
-     if log_reader_pid > 0:
-+        if not os.path.exists('/dev/tty'):
-+            return
-         # never actually close fd#1 or fd#2; insanity awaits.
-         # replace it with something else instead.
-         # Since our stdout/stderr are attached to redo-log's stdin,