From b5008c2c2d99e77c0ba22dab87334f84a4228511 Mon Sep 17 00:00:00 2001 From: Eduardo Abinader Date: Tue, 25 Feb 2014 17:27:03 -0400 Subject: [PATCH] tests: Fix trace parameter invocation If trace-cmd command does not exist, run-tests.py could end up hanging in a loop waiting for input. Fix this simply by checking whether the trace-cmd command can be executed sucessfully and exiting the script if not. Signed-off-by: Eduardo Abinader --- tests/hwsim/run-tests.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/hwsim/run-tests.py b/tests/hwsim/run-tests.py index b036a08ae..1bcf0823d 100755 --- a/tests/hwsim/run-tests.py +++ b/tests/hwsim/run-tests.py @@ -108,8 +108,12 @@ class DataCollector(object): stderr=open('/dev/null', 'w'), cwd=self._logdir) l = self._trace_cmd.stdout.read(7) - while not 'STARTED' in l: + while self._trace_cmd.poll() is None and not 'STARTED' in l: l += self._trace_cmd.stdout.read(1) + res = self._trace_cmd.returncode + if res: + print "Failed calling trace-cmd: returned exit status %d" % res + sys.exit(1) def __exit__(self, type, value, traceback): if self._tracing: self._trace_cmd.stdin.write('DONE\n')