From e57890e734b9727cbd98241b46832dbeb2535b1e Mon Sep 17 00:00:00 2001 From: Kevin Daudt Date: Mon, 28 Jan 2019 11:41:08 +0000 Subject: testing/redo: fix check failing due to missing /dev/tty On the builders, the checks failed because they tried to open /dev/tty, which does not exists. Add a patch that continues when /dev/tty is missing. Re-enable redo --- testing/redo/skip-when-tty-missing.patch | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 testing/redo/skip-when-tty-missing.patch (limited to 'testing/redo/skip-when-tty-missing.patch') diff --git a/testing/redo/skip-when-tty-missing.patch b/testing/redo/skip-when-tty-missing.patch new file mode 100644 index 0000000000..8acefbacd9 --- /dev/null +++ b/testing/redo/skip-when-tty-missing.patch @@ -0,0 +1,20 @@ +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, -- cgit v1.2.3