[llvm] 1500065 - [lit] Fix tests on Windows

[Julian Lettner via llvm-commits]

Author: Julian Lettner
Date: 2020-04-10T17:33:49-07:00
New Revision: 15000650a6d2e501eb521e0d94e6ea6fa6b16609

URL: https://github.com/llvm/llvm-project/commit/15000650a6d2e501eb521e0d94e6ea6fa6b16609
DIFF: https://github.com/llvm/llvm-project/commit/15000650a6d2e501eb521e0d94e6ea6fa6b16609.diff

LOG: [lit] Fix tests on Windows

max-time.py:
  Windows does not have a native `sleep` command, use `time.sleep()` in
  Python instead.

max-failures.py:
  The max-failure test reused the shtest-shell test inputs instead of
  defining its own "test domain".  However, the output of this
  shtest-shell "test domain" is slightly different on Windows, which now
  bites us since we made the max-failures test stricter.  Let's define
  our own "max failures" test domain.

Added: 
    llvm/utils/lit/tests/Inputs/max-failures/fail1.txt
    llvm/utils/lit/tests/Inputs/max-failures/fail2.txt
    llvm/utils/lit/tests/Inputs/max-failures/fail3.txt
    llvm/utils/lit/tests/Inputs/max-time/slow.py

Modified: 
    llvm/utils/lit/tests/Inputs/max-failures/lit.cfg
    llvm/utils/lit/tests/Inputs/max-time/lit.cfg
    llvm/utils/lit/tests/max-failures.py

Removed: 
    llvm/utils/lit/tests/Inputs/max-time/slow.txt


################################################################################
diff  --git a/llvm/utils/lit/tests/Inputs/max-failures/fail1.txt b/llvm/utils/lit/tests/Inputs/max-failures/fail1.txt
new file mode 100644
index 000000000000..15eb81a5f5e9
--- /dev/null
+++ b/llvm/utils/lit/tests/Inputs/max-failures/fail1.txt
@@ -0,0 +1 @@
+RUN: false

diff  --git a/llvm/utils/lit/tests/Inputs/max-failures/fail2.txt b/llvm/utils/lit/tests/Inputs/max-failures/fail2.txt
new file mode 100644
index 000000000000..15eb81a5f5e9
--- /dev/null
+++ b/llvm/utils/lit/tests/Inputs/max-failures/fail2.txt
@@ -0,0 +1 @@
+RUN: false

diff  --git a/llvm/utils/lit/tests/Inputs/max-failures/fail3.txt b/llvm/utils/lit/tests/Inputs/max-failures/fail3.txt
new file mode 100644
index 000000000000..15eb81a5f5e9
--- /dev/null
+++ b/llvm/utils/lit/tests/Inputs/max-failures/fail3.txt
@@ -0,0 +1 @@
+RUN: false

diff  --git a/llvm/utils/lit/tests/Inputs/max-failures/lit.cfg b/llvm/utils/lit/tests/Inputs/max-failures/lit.cfg
index 605bd7233670..f0f7649700ef 100644
--- a/llvm/utils/lit/tests/Inputs/max-failures/lit.cfg
+++ b/llvm/utils/lit/tests/Inputs/max-failures/lit.cfg
@@ -1,2 +1,6 @@
-lit_config.load_config(config, os.path.dirname(__file__) + "/../shtest-shell/lit.cfg")
-config.test_source_root = os.path.dirname(__file__) + '/../shtest-shell'
+import lit.formats
+config.name = 'max-failures'
+config.suffixes = ['.txt']
+config.test_format = lit.formats.ShTest()
+config.test_source_root = None
+config.test_exec_root = None

diff  --git a/llvm/utils/lit/tests/Inputs/max-time/lit.cfg b/llvm/utils/lit/tests/Inputs/max-time/lit.cfg
index 724adfe998e1..01784452bd9b 100644
--- a/llvm/utils/lit/tests/Inputs/max-time/lit.cfg
+++ b/llvm/utils/lit/tests/Inputs/max-time/lit.cfg
@@ -1,6 +1,7 @@
 import lit.formats
-config.name = 'lit-time'
-config.suffixes = ['.txt']
+config.name = 'max-time'
+config.suffixes = ['.txt', '.py']
 config.test_format = lit.formats.ShTest()
 config.test_source_root = None
 config.test_exec_root = None
+config.substitutions.append(('%{python}', '"%s"' % (sys.executable)))

diff  --git a/llvm/utils/lit/tests/Inputs/max-time/slow.py b/llvm/utils/lit/tests/Inputs/max-time/slow.py
new file mode 100644
index 000000000000..ca4d5d30da85
--- /dev/null
+++ b/llvm/utils/lit/tests/Inputs/max-time/slow.py
@@ -0,0 +1,7 @@
+# 'sleep 60' in Python because Windows does not have a native sleep command.
+#
+# RUN: %{python} %s
+
+import time
+
+time.sleep(60)

diff  --git a/llvm/utils/lit/tests/Inputs/max-time/slow.txt b/llvm/utils/lit/tests/Inputs/max-time/slow.txt
deleted file mode 100644
index 61275048d1e3..000000000000
--- a/llvm/utils/lit/tests/Inputs/max-time/slow.txt
+++ /dev/null
@@ -1 +0,0 @@
-RUN: sleep 60

diff  --git a/llvm/utils/lit/tests/max-failures.py b/llvm/utils/lit/tests/max-failures.py
index cdfe546c1ec2..4d4c897afdd9 100644
--- a/llvm/utils/lit/tests/max-failures.py
+++ b/llvm/utils/lit/tests/max-failures.py
@@ -6,18 +6,17 @@
 # RUN: not %{lit} --max-failures=0 -j 1 %{inputs}/max-failures 2>> %t.out
 # RUN: FileCheck < %t.out %s
 #
-# END.
 
 # CHECK-NOT: reached maximum number of test failures
 # CHECK-NOT: Skipped Tests
-# CHECK: Unexpected Failures: 35
+# CHECK: Unexpected Failures: 3
 
 # CHECK: reached maximum number of test failures, skipping remaining tests
-# CHECK: Skipped Tests      : 41
-# CHECK: Unexpected Failures:  1
+# CHECK: Skipped Tests      : 2
+# CHECK: Unexpected Failures: 1
 
 # CHECK: reached maximum number of test failures, skipping remaining tests
-# CHECK: Skipped Tests      : 40
-# CHECK: Unexpected Failures:  2
+# CHECK: Skipped Tests      : 1
+# CHECK: Unexpected Failures: 2
 
 # CHECK: error: argument --max-failures: requires positive integer, but found '0'