[LLVMbugs] [Bug 16743] Other/pipefail.txt fails when using a timeout command prefix

[bugzilla-daemon at llvm.org]

http://llvm.org/bugs/show_bug.cgi?id=16743

David Fang <fang at csl.cornell.edu> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|---                         |WORKSFORME

--- Comment #1 from David Fang <fang at csl.cornell.edu> ---
The revised local patch works for me:
(Don't timeout when command starts with a grouping operator.)

diff --git a/utils/lit/lit/LitConfig.py b/utils/lit/lit/LitConfig.py
index 9bcf20b..f2003eb 100644
--- a/utils/lit/lit/LitConfig.py
+++ b/utils/lit/lit/LitConfig.py
@@ -34,7 +34,8 @@ class LitConfig:
         self.debug = debug
         self.isWindows = bool(isWindows)
         self.params = dict(params)
-        self.bashPath = None
+       # local hack only, don't commit this patch
+        self.bashPath = '/sw/bin/bash'

         # Configuration files to look for when discovering test suites.
         self.config_prefix = config_prefix or 'lit'
diff --git a/utils/lit/lit/TestRunner.py b/utils/lit/lit/TestRunner.py
index daa9b7d..e988f2e 100644
--- a/utils/lit/lit/TestRunner.py
+++ b/utils/lit/lit/TestRunner.py
@@ -388,8 +388,11 @@ def parseIntegratedTestScript(test,
normalize_slashes=False
,
             # Collapse lines with trailing '\\'.
             if script and script[-1][-1] == '\\':
                 script[-1] = script[-1][:-1] + ln
-            else:
+            elif ln[1] == '(' or ln[1] == '{':
                 script.append(ln)
+            else:
+                script.append('gtimeout 5m ' +ln)
+               # do not commit this patch
         elif 'XFAIL:' in ln:
             items = ln[ln.index('XFAIL:') + 6:].split(',')
             xfails.extend([s.strip() for s in items])

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-bugs/attachments/20130730/ab956f34/attachment.html>