From cc07a0ba64b554ffd1ff85757b02cd79d30ed57a Mon Sep 17 00:00:00 2001 From: Thomas Miedema Date: Fri, 13 Mar 2015 21:07:15 +0100 Subject: Move the function strip_quotes to testutil.py If one runs the testsuite with a profiling compiler, during the import of `testlib.py`, `testlib.py` sets the global variable `gs_working`. To do so, it executes a few statements which require the function `strip_quotes` to be in scope. But that function only gets defined at the very end of testlib.py. This patch moves the definition of `strip_quotes` to testutil.py, which is imported at the very top of testlib.py. This unbreaks the nightly builders. Reviewed By: austin Differential Revision: https://phabricator.haskell.org/D728 --- testsuite/driver/testlib.py | 4 ---- 1 file changed, 4 deletions(-) (limited to 'testsuite/driver/testlib.py') diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py index fec6939168..1d3ef11cfd 100644 --- a/testsuite/driver/testlib.py +++ b/testsuite/driver/testlib.py @@ -2283,7 +2283,3 @@ def getStdout(cmd): return stdout else: raise Exception("Need subprocess to get stdout, but don't have it") - -def strip_quotes(s): - # Don't wrap commands to subprocess.call/Popen in quotes. - return s.strip('\'"') -- cgit v1.2.1