diff options
| author | Brad King <brad.king@kitware.com> | 2022-02-03 06:42:06 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-02-03 06:45:53 -0500 |
| commit | 9d621ceba115a409ca58e8c59fba365f55fd6d26 (patch) | |
| tree | 50234a073c5b466d02c1281e804a1829c65435e7 /Utilities/Release/win | |
| parent | 92459258108c0036808f29f83a8503fea18ccee9 (diff) | |
| download | cmake-9d621ceba115a409ca58e8c59fba365f55fd6d26.tar.gz | |
Tests: Run MFC test only when explicitly enabled
Previously we used a complicated heuristic to decide whether or not to
run the MFC test, but it sometimes decided incorrectly to run the test.
Since that was first written, we have developed a convention for other
tests to enable them via undocumented cache entries that are added only
on machines known to meet the tests' requirements. Do that for MFC.
Diffstat (limited to 'Utilities/Release/win')
| -rw-r--r-- | Utilities/Release/win/x86/cache-i386.txt | 3 | ||||
| -rw-r--r-- | Utilities/Release/win/x86/cache-x86_64.txt | 3 | ||||
| -rwxr-xr-x | Utilities/Release/win/x86/test/test-ninja.bat | 1 | ||||
| -rwxr-xr-x | Utilities/Release/win/x86/test/test-nmake.bat | 1 |
4 files changed, 0 insertions, 8 deletions
diff --git a/Utilities/Release/win/x86/cache-i386.txt b/Utilities/Release/win/x86/cache-i386.txt index 54a45d8fc4..2dcd4dd3a3 100644 --- a/Utilities/Release/win/x86/cache-i386.txt +++ b/Utilities/Release/win/x86/cache-i386.txt @@ -29,9 +29,6 @@ QCOLLECTIONGENERATOR_EXECUTABLE:PATH=C:/qt-i386/bin/qhelpgenerator.exe # No bootstrap with MSVC tools. CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE -# No MFC in base image. -CTEST_RUN_MFC:BOOL=OFF - # No Fortran compiler. CMAKE_Fortran_COMPILER:FILEPATH=FALSE diff --git a/Utilities/Release/win/x86/cache-x86_64.txt b/Utilities/Release/win/x86/cache-x86_64.txt index 0b78c72b9c..3c5593e15b 100644 --- a/Utilities/Release/win/x86/cache-x86_64.txt +++ b/Utilities/Release/win/x86/cache-x86_64.txt @@ -29,9 +29,6 @@ QCOLLECTIONGENERATOR_EXECUTABLE:PATH=C:/qt-x86_64/bin/qhelpgenerator.exe # No bootstrap with MSVC tools. CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE -# No MFC in base image. -CTEST_RUN_MFC:BOOL=OFF - # No Fortran compiler. CMAKE_Fortran_COMPILER:FILEPATH=FALSE diff --git a/Utilities/Release/win/x86/test/test-ninja.bat b/Utilities/Release/win/x86/test/test-ninja.bat index b8347efc62..fb43589128 100755 --- a/Utilities/Release/win/x86/test/test-ninja.bat +++ b/Utilities/Release/win/x86/test/test-ninja.bat @@ -12,7 +12,6 @@ cd \cmake\src\cmake-ninja && ^ @echo CMake_TEST_IPO_WORKS_C:BOOL=ON @echo CMake_TEST_IPO_WORKS_CXX:BOOL=ON @echo CMake_TEST_NO_NETWORK:BOOL=ON - @echo CTEST_RUN_MFC:BOOL=OFF ) && ^ cmake ..\cmake -DCMake_TEST_HOST_CMAKE=1 -G "Ninja" && ^ ninja && ^ diff --git a/Utilities/Release/win/x86/test/test-nmake.bat b/Utilities/Release/win/x86/test/test-nmake.bat index 5008711ac4..9d7e447891 100755 --- a/Utilities/Release/win/x86/test/test-nmake.bat +++ b/Utilities/Release/win/x86/test/test-nmake.bat @@ -12,7 +12,6 @@ cd \cmake\src\cmake-nmake && ^ @echo CMake_TEST_IPO_WORKS_C:BOOL=ON @echo CMake_TEST_IPO_WORKS_CXX:BOOL=ON @echo CMake_TEST_NO_NETWORK:BOOL=ON - @echo CTEST_RUN_MFC:BOOL=OFF ) && ^ cmake ..\cmake -DCMake_TEST_HOST_CMAKE=1 -G "NMake Makefiles" && ^ nmake && ^ |