From c864ffceb7e2e4fbd31a28b44c6f6ee083a903fa Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 24 Sep 2024 11:06:24 -0400 Subject: Tests/RunCMake/file-DOWNLOAD: Clarify name of invalid TLS_VERSION case The test case is about an invalid version specification, not a TLS version unsupported by the server. --- Tests/RunCMake/file-DOWNLOAD/RunCMakeTest.cmake | 2 +- Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-bad-result.txt | 1 - Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-bad-stderr.txt | 14 -------------- Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-bad.cmake | 10 ---------- .../RunCMake/file-DOWNLOAD/TLS_VERSION-invalid-result.txt | 1 + .../RunCMake/file-DOWNLOAD/TLS_VERSION-invalid-stderr.txt | 14 ++++++++++++++ Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-invalid.cmake | 10 ++++++++++ 7 files changed, 26 insertions(+), 26 deletions(-) delete mode 100644 Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-bad-result.txt delete mode 100644 Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-bad-stderr.txt delete mode 100644 Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-bad.cmake create mode 100644 Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-invalid-result.txt create mode 100644 Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-invalid-stderr.txt create mode 100644 Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-invalid.cmake diff --git a/Tests/RunCMake/file-DOWNLOAD/RunCMakeTest.cmake b/Tests/RunCMake/file-DOWNLOAD/RunCMakeTest.cmake index 5e0310b..2dc2de0 100644 --- a/Tests/RunCMake/file-DOWNLOAD/RunCMakeTest.cmake +++ b/Tests/RunCMake/file-DOWNLOAD/RunCMakeTest.cmake @@ -11,6 +11,7 @@ run_cmake(httpheader-not-set) run_cmake(netrc-bad) run_cmake(tls-cainfo-not-set) run_cmake(tls-verify-not-set) +run_cmake(TLS_VERSION-invalid) run_cmake(TLS_VERSION-missing) run_cmake(pass-not-set) run_cmake(no-save-hash) @@ -26,7 +27,6 @@ if(NOT CMake_TEST_NO_NETWORK) run_cmake(bad-hostname) endif() -run_cmake_with_options(TLS_VERSION-bad) if(CMake_TEST_TLS_VERIFY_URL_BAD) run_cmake_with_options(TLS_VERIFY-bad -Durl=${CMake_TEST_TLS_VERIFY_URL_BAD}) endif() diff --git a/Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-bad-result.txt b/Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-bad-result.txt deleted file mode 100644 index d00491f..0000000 --- a/Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-bad-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-bad-stderr.txt b/Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-bad-stderr.txt deleted file mode 100644 index 421c8cf..0000000 --- a/Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-bad-stderr.txt +++ /dev/null @@ -1,14 +0,0 @@ -^CMake Error at TLS_VERSION-bad\.cmake:[0-9]+ \(file\): - file DOWNLOAD given unknown TLS/SSL version bad-env -Call Stack \(most recent call first\): - CMakeLists\.txt:[0-9]+ \(include\) -+ -CMake Error at TLS_VERSION-bad\.cmake:[0-9]+ \(file\): - file DOWNLOAD given unknown TLS/SSL version bad-var -Call Stack \(most recent call first\): - CMakeLists\.txt:[0-9]+ \(include\) -+ -CMake Error at TLS_VERSION-bad\.cmake:[0-9]+ \(file\): - file DOWNLOAD given unknown TLS/SSL version bad-arg -Call Stack \(most recent call first\): - CMakeLists\.txt:[0-9]+ \(include\)$ diff --git a/Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-bad.cmake b/Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-bad.cmake deleted file mode 100644 index 51ae4a2..0000000 --- a/Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-bad.cmake +++ /dev/null @@ -1,10 +0,0 @@ -# The environment variable provides a default. -set(ENV{CMAKE_TLS_VERSION} bad-env) -file(DOWNLOAD "" TLS_VERIFY 1 STATUS status LOG log) - -# The cmake variable overrides the environment variable. -set(CMAKE_TLS_VERSION bad-var) -file(DOWNLOAD "" TLS_VERIFY 1 STATUS status LOG log) - -# The explicit argument overrides the cmake variable. -file(DOWNLOAD "" TLS_VERSION bad-arg TLS_VERIFY 1 STATUS status LOG log) diff --git a/Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-invalid-result.txt b/Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-invalid-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-invalid-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-invalid-stderr.txt b/Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-invalid-stderr.txt new file mode 100644 index 0000000..565facb --- /dev/null +++ b/Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-invalid-stderr.txt @@ -0,0 +1,14 @@ +^CMake Error at TLS_VERSION-invalid\.cmake:[0-9]+ \(file\): + file DOWNLOAD given unknown TLS/SSL version bad-env +Call Stack \(most recent call first\): + CMakeLists\.txt:[0-9]+ \(include\) ++ +CMake Error at TLS_VERSION-invalid\.cmake:[0-9]+ \(file\): + file DOWNLOAD given unknown TLS/SSL version bad-var +Call Stack \(most recent call first\): + CMakeLists\.txt:[0-9]+ \(include\) ++ +CMake Error at TLS_VERSION-invalid\.cmake:[0-9]+ \(file\): + file DOWNLOAD given unknown TLS/SSL version bad-arg +Call Stack \(most recent call first\): + CMakeLists\.txt:[0-9]+ \(include\)$ diff --git a/Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-invalid.cmake b/Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-invalid.cmake new file mode 100644 index 0000000..51ae4a2 --- /dev/null +++ b/Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-invalid.cmake @@ -0,0 +1,10 @@ +# The environment variable provides a default. +set(ENV{CMAKE_TLS_VERSION} bad-env) +file(DOWNLOAD "" TLS_VERIFY 1 STATUS status LOG log) + +# The cmake variable overrides the environment variable. +set(CMAKE_TLS_VERSION bad-var) +file(DOWNLOAD "" TLS_VERIFY 1 STATUS status LOG log) + +# The explicit argument overrides the cmake variable. +file(DOWNLOAD "" TLS_VERSION bad-arg TLS_VERIFY 1 STATUS status LOG log) -- cgit v0.12