From ca3502c26ead1f47b976b6666da8a8946a2b782a Mon Sep 17 00:00:00 2001 From: Stella Stamenova Date: Mon, 10 Sep 2018 20:24:05 +0000 Subject: [PATCH] [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 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@341856 91177308-0d34-0410-b5e6-96231b3b80d8 --- utils/lit/tests/Inputs/shtest-timeout/lit.cfg | 4 +--- utils/lit/tests/shtest-timeout.py | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/utils/lit/tests/Inputs/shtest-timeout/lit.cfg b/utils/lit/tests/Inputs/shtest-timeout/lit.cfg index a98a7367944..96bf18170a8 100644 --- a/utils/lit/tests/Inputs/shtest-timeout/lit.cfg +++ b/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/utils/lit/tests/shtest-timeout.py b/utils/lit/tests/shtest-timeout.py index 2f1fc3d17c0..9ed8ebe8ddd 100644 --- a/utils/lit/tests/shtest-timeout.py +++ b/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 -- 2.11.0