From 6a501b6519850c0dd2bcc687cd8da6fc6c9459d5 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 28 Apr 2016 10:03:07 -0400 Subject: [PATCH] Tests: Drop test for VS 7.0 generator deprecation warnings We removed this generator but forgot to remove this now-unused test case. --- Tests/RunCMake/CommandLine/DeprecateVS70-WARN-OFF.cmake | 0 .../RunCMake/CommandLine/DeprecateVS70-WARN-ON-stderr.txt | 5 ----- Tests/RunCMake/CommandLine/DeprecateVS70-WARN-ON.cmake | 0 Tests/RunCMake/CommandLine/RunCMakeTest.cmake | 7 ------- Tests/RunCMake/RunCMake.cmake | 3 --- 5 files changed, 15 deletions(-) delete mode 100644 Tests/RunCMake/CommandLine/DeprecateVS70-WARN-OFF.cmake delete mode 100644 Tests/RunCMake/CommandLine/DeprecateVS70-WARN-ON-stderr.txt delete mode 100644 Tests/RunCMake/CommandLine/DeprecateVS70-WARN-ON.cmake diff --git a/Tests/RunCMake/CommandLine/DeprecateVS70-WARN-OFF.cmake b/Tests/RunCMake/CommandLine/DeprecateVS70-WARN-OFF.cmake deleted file mode 100644 index e69de29bb..000000000 diff --git a/Tests/RunCMake/CommandLine/DeprecateVS70-WARN-ON-stderr.txt b/Tests/RunCMake/CommandLine/DeprecateVS70-WARN-ON-stderr.txt deleted file mode 100644 index ea31ef315..000000000 --- a/Tests/RunCMake/CommandLine/DeprecateVS70-WARN-ON-stderr.txt +++ /dev/null @@ -1,5 +0,0 @@ -^CMake Warning: - The "Visual Studio 7" generator is deprecated and will be removed in a - future version of CMake. - - Add CMAKE_WARN_VS70=OFF to the cache to disable this warning.$ diff --git a/Tests/RunCMake/CommandLine/DeprecateVS70-WARN-ON.cmake b/Tests/RunCMake/CommandLine/DeprecateVS70-WARN-ON.cmake deleted file mode 100644 index e69de29bb..000000000 diff --git a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake index 3b5504ece..7e26ce778 100644 --- a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake +++ b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake @@ -72,13 +72,6 @@ if(RunCMake_GENERATOR STREQUAL "Ninja") unset(RunCMake_TEST_NO_CLEAN) endif() -if(RunCMake_GENERATOR STREQUAL "Visual Studio 7") - set(RunCMake_WARN_VS70 1) - run_cmake(DeprecateVS70-WARN-ON) - unset(RunCMake_WARN_VS70) - run_cmake(DeprecateVS70-WARN-OFF) -endif() - if(UNIX) run_cmake_command(E_create_symlink-no-arg ${CMAKE_COMMAND} -E create_symlink diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake index 9d44a8af3..736faf185 100644 --- a/Tests/RunCMake/RunCMake.cmake +++ b/Tests/RunCMake/RunCMake.cmake @@ -51,9 +51,6 @@ function(run_cmake test) if(APPLE) list(APPEND RunCMake_TEST_OPTIONS -DCMAKE_POLICY_DEFAULT_CMP0025=NEW) endif() - if(RunCMake_GENERATOR STREQUAL "Visual Studio 7" AND NOT RunCMake_WARN_VS70) - list(APPEND RunCMake_TEST_OPTIONS -DCMAKE_WARN_VS70=OFF) - endif() if(RunCMake_MAKE_PROGRAM) list(APPEND RunCMake_TEST_OPTIONS "-DCMAKE_MAKE_PROGRAM=${RunCMake_MAKE_PROGRAM}") endif()