Skip to content

Commit 012ac5d

Browse files
authored
Merge pull request #80093 from etcwilde/ewilde/ninja-skip-build-testing
Disable building Ninja tests
2 parents 35f55e8 + d2d5925 commit 012ac5d

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

utils/swift_build_support/swift_build_support/products/ninja.py

+1
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ def build(self):
5757
"-S", self.source_dir,
5858
"-B", self.build_dir,
5959
"-DCMAKE_BUILD_TYPE=Release",
60+
"-DBUILD_TESTING=OFF",
6061
f"-DCMAKE_C_COMPILER={self.toolchain.cc}",
6162
f"-DCMAKE_CXX_COMPILER={self.toolchain.cxx}"])
6263
shell.call([self.toolchain.cmake, "--build", self.build_dir])

utils/swift_build_support/tests/products/test_ninja.py

+1
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ def test_build(self):
9393
-S {self.workspace.source_dir('ninja')} \
9494
-B {self.workspace.build_dir('build', 'ninja')} \
9595
-DCMAKE_BUILD_TYPE=Release \
96+
-DBUILD_TESTING=OFF \
9697
-DCMAKE_C_COMPILER=/path/to/cc \
9798
-DCMAKE_CXX_COMPILER=/path/to/cxx
9899
+ {self.toolchain.cmake} --build {self.workspace.build_dir('build', 'ninja')}

0 commit comments

Comments
 (0)