[lit] Disable shtest-timeout on Windows

Summary: This is the only test that is still failing on Windows - or rather, it is expected to fail on the bots, but passes on the new bot that we're preparing causing a failure, so I'm going to disable it. Since the test has rarely, if ever, passed on the bots, this should have the same effect and it will unblock the creation of the new bot.

Reviewers: asmith, delcypher, zturner

Subscribers: stella.stamenova, llvm-commits

Differential Revision: https://reviews.llvm.org/D51871

llvm-svn: 341856

diff --git a/llvm/utils/lit/tests/Inputs/shtest-timeout/lit.cfg b/llvm/utils/lit/tests/Inputs/shtest-timeout/lit.cfg
index a98a736..96bf181 100644 (file)
--- a/llvm/utils/lit/tests/Inputs/shtest-timeout/lit.cfg
+++ b/llvm/utils/lit/tests/Inputs/shtest-timeout/lit.cfg
@@ -13,9 +13,7 @@ if shellType == '0':
     externalShell = False
 else:
     lit_config.note('Using external shell')
-    externalShell = (not sys.platform in ['win32'])
-    if not externalShell:
-        lit_config.note('External shell requested, but using internal shell')
+    externalShell = True
 
 configSetTimeout = lit_config.params.get('set_timeout', '0')
 

diff --git a/llvm/utils/lit/tests/shtest-timeout.py b/llvm/utils/lit/tests/shtest-timeout.py
index 2f1fc3d..9ed8ebe 100644 (file)
--- a/llvm/utils/lit/tests/shtest-timeout.py
+++ b/llvm/utils/lit/tests/shtest-timeout.py
@@ -1,7 +1,7 @@
 # REQUIRES: python-psutil
 
-# PR33944
-# XFAIL: windows
+# llvm.org/PR33944
+# REQUIRES: nowindows
 
 # FIXME: This test is fragile because it relies on time which can
 # be affected by system performance. In particular we are currently