Merge pull request #167 from mull-project/focused-itest

tasks: add --focus parameter to run focused integration tests
mull-project · Dec 4, 2021 · 97c1f62 · 97c1f62
2 parents 093f30c + 42af296
commit 97c1f62
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 13 deletions.
diff --git a/tasks.py b/tasks.py
@@ -1,6 +1,7 @@
 import os
 import platform
 import re
+from typing import Optional
 
 from invoke import task
 
@@ -37,61 +38,66 @@ def formatted_command(string):
     return re.sub('\\s+', ' ', string).strip()
 
 
-def run_lit_tests(c, filecheck_exec, filecheck_tester_exec, llvm_only):
+def run_lit_tests(
+    c, filecheck_exec, filecheck_tester_exec, focus: Optional[str], llvm_only
+):
     assert c
     assert filecheck_exec
     assert llvm_only is not None
 
     cwd = os.getcwd()
 
     llvm_only_value = "1" if llvm_only else ""
+    focus_or_none = f"--filter {focus}" if focus else ""
 
     command = formatted_command("""
         lit
         --param REAL_ONLY={llvm_only_value}
         --param FILECHECK_EXEC="{filecheck_exec}"
         --param FILECHECK_TESTER_EXEC="{filecheck_tester_exec}"
         -v
+        {focus_or_none}
         {cwd}/tests/integration
     """).format(cwd=cwd,
                 filecheck_exec=filecheck_exec,
                 filecheck_tester_exec=filecheck_tester_exec,
+                focus_or_none=focus_or_none,
                 llvm_only_value=llvm_only_value)
 
     print(command)
     c.run("{}".format(command))
 
 
 @task
-def test_filecheck_llvm(c):
+def test_filecheck_llvm(c, focus=None):
     filecheck_llvm_8_exec = get_filecheck_llvm_path(FILECHECK_LLVM_8_EXEC)
     filecheck_llvm_9_exec = get_filecheck_llvm_path(FILECHECK_LLVM_9_EXEC)
     filecheck_tester_exec = get_filecheck_llvm_path(FILECHECK_LLVM_9_EXEC)
 
     # run_lit_tests(c, filecheck_llvm_8_exec, filecheck_tester_exec, True)
-    run_lit_tests(c, filecheck_llvm_9_exec, filecheck_tester_exec, True)
+    run_lit_tests(c, filecheck_llvm_9_exec, filecheck_tester_exec, focus, True)
 
 
 @task
-def test_filecheck_py_using_file_check_llvm_tester(c):
+def test_filecheck_py_using_file_check_llvm_tester(c, focus=None):
     filecheck_exec = get_filecheck_py_exec()
     filecheck_tester_exec = get_filecheck_llvm_path(FILECHECK_LLVM_9_EXEC)
 
-    run_lit_tests(c, filecheck_exec, filecheck_tester_exec, False)
+    run_lit_tests(c, filecheck_exec, filecheck_tester_exec, focus, False)
 
 
 @task
-def test_filecheck_py_using_filecheck_py_tester(c):
+def test_filecheck_py_using_filecheck_py_tester(c, focus=None):
     filecheck_exec = get_filecheck_py_exec()
     filecheck_tester_exec = filecheck_exec
 
-    run_lit_tests(c, filecheck_exec, filecheck_tester_exec, False)
+    run_lit_tests(c, filecheck_exec, filecheck_tester_exec, focus, False)
 
 
 @task
-def test(c):
-    test_filecheck_llvm(c)
-    test_filecheck_py_using_file_check_llvm_tester(c)
+def test(c, focus=None):
+    test_filecheck_llvm(c, focus)
+    test_filecheck_py_using_file_check_llvm_tester(c, focus)
 
 
 @task

diff --git a/tests/integration/tests/examples/lit-and-filecheck/01-pass.c b/tests/integration/tests/examples/lit-and-filecheck/01-pass.c
@@ -1,5 +1,5 @@
 /**
-; RUN: gcc "%s" -o %S/hello-world-1 && %S/hello-world-1 | filecheck %s
+; RUN: gcc "%s" -o %S/hello-world-1 && %S/hello-world-1 | %FILECHECK_EXEC %s
 ; CHECK: Hello world
  */
 

diff --git a/tests/integration/tests/examples/lit-and-filecheck/02-fail.c b/tests/integration/tests/examples/lit-and-filecheck/02-fail.c
@@ -1,5 +1,5 @@
 /**
-; RUN: gcc "%s" -o %S/hello-world-2 && %S/hello-world-2 | filecheck %s; test $? = 1
+; RUN: gcc "%s" -o %S/hello-world-2 && %S/hello-world-2 | %FILECHECK_EXEC %s; test $? = 1
 ; CHECK: Wrong line
  */
 

diff --git a/tests/integration/tests/examples/lit-and-filecheck/minimal.itest b/tests/integration/tests/examples/lit-and-filecheck/minimal.itest
@@ -1,2 +1,2 @@
-RUN: echo "Hello world" | filecheck %s
+RUN: echo "Hello world" | %FILECHECK_EXEC %s
 CHECK: Hello world