join files

Author: makslevental

mlir/examples/standalone/test/CMakeLists.txt

@@ -10,7 +10,7 @@ configure_lit_site_cfg(
 )
 
 set(STANDALONE_TEST_DEPENDS
-        FileCheck count not
+        FileCheck
         standalone-capi-test
         standalone-opt
         standalone-translate

mlir/examples/standalone/test/lit.cfg.py

@@ -53,7 +53,7 @@
 
 tool_dirs = [config.standalone_tools_dir, config.llvm_tools_dir]
 tools = [
-    "mlir-opt",
+    ToolSubst("mlir-opt", pre=";", post=";", unresolved="fatal"),
     "standalone-capi-test",
     "standalone-opt",
     "standalone-translate",

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

@@ -16,3 +16,11 @@ config.substitutions.append(("%host_cmake_install_prefix", config.host_cmake_ins
 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))
+
+# see https://github.com/llvm/llvm-project/blob/57782eff31e9d454b54a201c7ac43dc1b93dbb3f/llvm/utils/lit/lit/TestRunner.py#L1858
+config.substitutions.insert(0, ("FileCheck", "FileChuck"))
+config.substitutions.insert(0, ("count", "kount"))
+config.substitutions.insert(0, ("not", "mot"))
+config.substitutions.append(("kount", "count"))
+config.substitutions.append(("mot", "not"))
+config.substitutions.append(("FileChuck", "FileCheck"))

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

@@ -1,18 +1,54 @@
-# REQUIRES: github-actions
-# RUN: rm -rf %host_cmake_install_prefix
-# RUN: "%cmake_exe" --build "%llvm_obj_root" --target install
+# REQUIRESgithub-actions
+
+# RUN: echo "test full install" | tee %t
+# CHECK: test full install
+
+# RUN: rm -rf "%host_cmake_install_prefix"
+
+# RUN: "%cmake_exe" --build "%llvm_obj_root" --target install -j | tee -a %t
+
 # RUN: "%cmake_exe" "%mlir_src_root/examples/standalone" -G "%cmake_generator" \
 # RUN: -DCMAKE_CXX_COMPILER=%host_cxx -DCMAKE_C_COMPILER=%host_cc \
 # RUN: -DCMAKE_CXX_COMPILER_LAUNCHER=%cmake_cxx_compiler_launcher -DCMAKE_C_COMPILER_LAUNCHER=%cmake_c_compiler_launcher \
-# RUN: -DLLVM_ENABLE_LIBCXX=%enable_libcxx -DMLIR_DIR="%host_cmake_install_prefix" \
+# RUN: -DLLVM_ENABLE_LIBCXX=%enable_libcxx \
+# RUN: -DLLVM_EXTERNAL_LIT="%llvm_obj_root/bin/llvm-lit" \
+# RUN: -DMLIR_DIR="%host_cmake_install_prefix/lib/cmake/mlir" \
+# RUN: -DLLVM_DIR="%host_cmake_install_prefix/lib/cmake/llvm" \
 # RUN: -DLLVM_USE_LINKER=%llvm_use_linker \
 # RUN: -DPython3_EXECUTABLE=%python \
-# RUN: -DPython_EXECUTABLE=%python
-# RUN: "%cmake_exe" --build . --target check-standalone | tee %t
+# RUN: -DPython_EXECUTABLE=%python | tee -a %t
+
+# RUN: "%cmake_exe" --build . --target check-standalone -j | tee -a %t
+
+# CHECK: Passed
+# CHECK-NOT: Failed
+# UNSUPPORTED: target={{.*(windows|android).*}}
+
+# RUN: rm -rf "%host_cmake_install_prefix"
+
+# RUN: echo "test install distribution" | tee -a %t
+# CHECK: test install distribution
+
+# 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-opt;mlir-python-sources" | tee -a %t
+
+# RUN: "%cmake_exe" --build "%llvm_obj_root" --target install-distribution -j | tee -a %t
+
+# RUN: "%cmake_exe" "%mlir_src_root/examples/standalone" -G "%cmake_generator" \
+# RUN: -DCMAKE_CXX_COMPILER=%host_cxx -DCMAKE_C_COMPILER=%host_cc \
+# RUN: -DCMAKE_CXX_COMPILER_LAUNCHER=%cmake_cxx_compiler_launcher -DCMAKE_C_COMPILER_LAUNCHER=%cmake_c_compiler_launcher \
+# RUN: -DLLVM_ENABLE_LIBCXX=%enable_libcxx \
+# RUN: -DLLVM_EXTERNAL_LIT="%llvm_obj_root/bin/llvm-lit" \
+# RUN: -DMLIR_DIR="%host_cmake_install_prefix/lib/cmake/mlir" \
+# RUN: -DLLVM_DIR="%host_cmake_install_prefix/lib/cmake/llvm" \
+# RUN: -DLLVM_USE_LINKER=%llvm_use_linker \
+# RUN: -DPython3_EXECUTABLE=%python \
+# RUN: -DPython_EXECUTABLE=%python | tee -a %t
+
+# RUN: "%cmake_exe" --build . --target check-standalone -j | tee -a %t
+
 # RUN: FileCheck --input-file=%t %s
 
-# Note: The number of checked tests is not important. The command will fail
-# if any fail.
 # CHECK: Passed
 # CHECK-NOT: Failed
 # UNSUPPORTED: target={{.*(windows|android).*}}

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

@@ -318,7 +318,7 @@ def find_real_python_interpreter():
         ]
     )
 else:
-    tools.extend(["mlir-opt"])
+    tools.extend([ToolSubst("mlir-opt", pre=";", post=";", unresolved="fatal")])
 
 llvm_config.add_tool_substitutions(tools, tool_dirs)