Update test.install-distribution-dir.toy

Author: makslevental

llvm/utils/lit/lit/llvm/config.py

@@ -461,20 +461,22 @@ def add_err_msg_substitutions(self):
 
     def use_default_substitutions(self):
         tool_patterns = [
-            ToolSubst("FileCheck", unresolved="fatal"),
+            ToolSubst("FileCheck", pre=";", post=";", unresolved="fatal"),
             # Handle these specially as they are strings searched for during
             # testing.
             ToolSubst(
                 r"\| \bcount\b",
                 command=FindTool("count"),
                 verbatim=True,
                 unresolved="fatal",
+                pre=";", post=";",
             ),
             ToolSubst(
                 r"\| \bnot\b",
                 command=FindTool("not"),
                 verbatim=True,
                 unresolved="fatal",
+                pre=";", post=";",
             ),
         ]
 

mlir/examples/standalone/CMakeLists.txt

@@ -8,7 +8,6 @@ set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ standard to conform to")
 if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
   find_package(MLIR REQUIRED CONFIG)
 
-
   # Define the default argument to use by `lit` when testing.
   set(LLVM_LIT_ARGS "-sv" CACHE STRING "Default options for lit")
 

mlir/test/Examples/standalone/lit.local.cfg

@@ -13,4 +13,6 @@ config.substitutions.append(("%llvm_use_linker", config.llvm_use_linker))
 config.substitutions.append(("%llvm_obj_root", config.llvm_obj_root))
 config.substitutions.append(("%llvm_src_root", config.llvm_src_root))
 config.substitutions.append(("%host_cmake_install_prefix", config.host_cmake_install_prefix))
-config.substitutions.append(("%host_cmake_cmd", config.host_cmake))
+config.substitutions.append(("%cmake_build_type", config.cmake_build_type))
+config.substitutions.append(("%cmake_c_compiler_launcher", config.cmake_c_compiler_launcher))
+config.substitutions.append(("%cmake_cxx_compiler_launcher", config.cmake_cxx_compiler_launcher))

mlir/test/Examples/standalone/test.install-dir.toy

@@ -1,4 +1,5 @@
 # REQUIRES: github-actions
+# RUN: rm -rf %host_cmake_install_prefix
 # RUN: "%cmake_exe" --build "%llvm_obj_root" --target install
 # RUN: "%cmake_exe" "%mlir_src_root/examples/standalone" -G "%cmake_generator" \
 # RUN: -DCMAKE_CXX_COMPILER=%host_cxx -DCMAKE_C_COMPILER=%host_cc \

mlir/test/Examples/standalone/test.install-distribution-dir.toy

@@ -1,5 +1,7 @@
 # REQUIRES: github-actions
-# RUN: "%cmake_exe" "%llvm_src_root" -DLLVM_DISTRIBUTION_COMPONENTS="llvm-headers;llvm-libraries;cmake-exports;FileCheck;count;not;mlir-headers;mlir-libraries;mlir-cmake-exports;mlir-tblgen;mlir-python-sources"
+# RUN: rm -rf %host_cmake_install_prefix
+# RUN: "%cmake_exe" "%llvm_src_root" -DCMAKE_BUILD_TYPE=%cmake_build_type -B "%llvm_obj_root" \
+# RUN: -DLLVM_DISTRIBUTION_COMPONENTS="llvm-headers;llvm-libraries;cmake-exports;FileCheck;count;not;mlir-headers;mlir-libraries;mlir-cmake-exports;mlir-tblgen;mlir-python-sources"
 # RUN: "%cmake_exe" --build "%llvm_obj_root" --target install-distribution
 # RUN: "%cmake_exe" "%mlir_src_root/examples/standalone" -G "%cmake_generator" \
 # RUN: -DCMAKE_CXX_COMPILER=%host_cxx -DCMAKE_C_COMPILER=%host_cc \

mlir/test/lit.cfg.py

@@ -187,7 +187,7 @@ def find_real_python_interpreter():
     llvm_config.with_environment("PATH", dirs, append_path=True)
 
 tools = [
-    "mlir-tblgen",
+    ToolSubst("mlir-tblgen", pre=";", post=";", unresolved="fatal"),
     "mlir-translate",
     "mlir-lsp-server",
     "mlir-capi-execution-engine-test",

mlir/test/lit.site.cfg.py.in

@@ -18,6 +18,9 @@ config.host_cc = "@HOST_CC@"
 config.host_cxx = "@HOST_CXX@"
 config.enable_libcxx = "@LLVM_ENABLE_LIBCXX@"
 config.host_cmake = "@CMAKE_COMMAND@"
+config.cmake_build_type = "@CMAKE_BUILD_TYPE@"
+config.cmake_c_compiler_launcher = "@CMAKE_C_COMPILER_LAUNCHER@"
+config.cmake_cxx_compiler_launcher= "@CMAKE_CXX_COMPILER_LAUNCHER@"
 config.host_cmake_generator = "@CMAKE_GENERATOR@"
 config.host_cmake_install_prefix = "@CMAKE_INSTALL_PREFIX@"
 config.llvm_use_linker = "@LLVM_USE_LINKER@"