Skip to content

Commit 213dc5f

Browse files
committed
disable by default
1 parent 64f5d11 commit 213dc5f

File tree

4 files changed

+5
-11
lines changed

4 files changed

+5
-11
lines changed

.ci/monolithic-linux.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,13 @@ cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \
5858
-D CMAKE_CXX_COMPILER_LAUNCHER=sccache \
5959
-D LIBCXX_CXX_ABI=libcxxabi \
6060
-D MLIR_ENABLE_BINDINGS_PYTHON=ON \
61+
-D MLIR_RUN_STANDALONE_INSTALL_TESTS=ON \
6162
-D LLDB_ENABLE_PYTHON=ON \
6263
-D LLDB_ENFORCE_STRICT_TEST_REQUIREMENTS=ON \
6364
-D CMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \
6465
-D CMAKE_EXE_LINKER_FLAGS="-no-pie" \
6566
-D LLVM_ENABLE_WERROR=ON \
66-
-DLLVM_BUILD_UTILS=ON \
67-
-DLLVM_INCLUDE_UTILS=ON \
68-
-DLLVM_INSTALL_UTILS=ON
67+
-D LLVM_INSTALL_UTILS=ON
6968

7069
start-group "ninja"
7170

.ci/monolithic-windows.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,12 @@ cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \
4646
-D CMAKE_C_COMPILER_LAUNCHER=sccache \
4747
-D CMAKE_CXX_COMPILER_LAUNCHER=sccache \
4848
-D MLIR_ENABLE_BINDINGS_PYTHON=ON \
49+
-D MLIR_RUN_STANDALONE_INSTALL_TESTS=ON \
4950
-D CMAKE_EXE_LINKER_FLAGS="/MANIFEST:NO" \
5051
-D CMAKE_MODULE_LINKER_FLAGS="/MANIFEST:NO" \
5152
-D CMAKE_SHARED_LINKER_FLAGS="/MANIFEST:NO" \
5253
-D LLVM_ENABLE_RUNTIMES="${runtimes}" \
53-
-DLLVM_BUILD_UTILS=ON \
54-
-DLLVM_INCLUDE_UTILS=ON \
55-
-DLLVM_INSTALL_UTILS=ON
54+
-D LLVM_INSTALL_UTILS=ON
5655

5756
start-group "ninja"
5857

mlir/test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ if (MLIR_INCLUDE_INTEGRATION_TESTS)
6565

6666
endif()
6767

68-
option(MLIR_RUN_STANDALONE_INSTALL_TESTS "Run Standalone example install tests." ON)
68+
option(MLIR_RUN_STANDALONE_INSTALL_TESTS "Run Standalone example install tests." OFF)
6969
if(MLIR_RUN_STANDALONE_INSTALL_TESTS AND "${CMAKE_INSTALL_PREFIX}" STREQUAL "")
7070
message(WARNING "Standalone example install tests will install into root!\
7171
If you want to disable this behavior pass -DMLIR_RUN_STANDALONE_INSTALL_TESTS=OFF")

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
# RUN: echo "test full install" | tee %t
44
# CHECK: test full install
55

6-
# RUN: rm -rf "%host_cmake_install_prefix"
7-
86
# RUN: "%cmake_exe" --build "%llvm_obj_root" --target install -j | tee -a %t
97

108
# RUN: "%cmake_exe" "%mlir_src_root/examples/standalone" -G "%cmake_generator" \
@@ -24,8 +22,6 @@
2422
# CHECK-NOT: Failed
2523
# UNSUPPORTED: target={{.*(windows|android).*}}
2624

27-
# RUN: rm -rf "%host_cmake_install_prefix"
28-
2925
# RUN: echo "test install distribution" | tee -a %t
3026
# CHECK: test install distribution
3127

0 commit comments

Comments
 (0)