diff options
| author | Brad King <brad.king@kitware.com> | 2017-02-07 19:25:49 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-02-10 18:10:07 (GMT) |
| commit | 14c771530a12feb4f92fb0ab466b40ff68997b05 (patch) | |
| tree | f417556da0669cd637283c5fc6618330a0b2cb97 /Tests/CMakeTests | |
| parent | 73ae67006c952b8804f2566e868bc3acf7539857 (diff) | |
| download | CMake-14c771530a12feb4f92fb0ab466b40ff68997b05.zip CMake-14c771530a12feb4f92fb0ab466b40ff68997b05.tar.gz CMake-14c771530a12feb4f92fb0ab466b40ff68997b05.tar.bz2 | |
Tests: Fix `file://` URLs given to curl
Since upstream curl commit curl-7_52_0~131 (URL-parser: for
file://[host]/ URLs, the [host] must be localhost, 2016-11-11) we can no
longer use URLs of the form `file://c:/...` on Windows. These worked
only accidentally before. Use `file:///c:/...` instead.
Diffstat (limited to 'Tests/CMakeTests')
| -rw-r--r-- | Tests/CMakeTests/FileDownloadBadHashTest.cmake.in | 5 | ||||
| -rw-r--r-- | Tests/CMakeTests/FileDownloadTest.cmake.in | 5 | ||||
| -rw-r--r-- | Tests/CMakeTests/FileUploadTest.cmake.in | 5 |
3 files changed, 12 insertions, 3 deletions
diff --git a/Tests/CMakeTests/FileDownloadBadHashTest.cmake.in b/Tests/CMakeTests/FileDownloadBadHashTest.cmake.in index 4a47c06..64b45ed 100644 --- a/Tests/CMakeTests/FileDownloadBadHashTest.cmake.in +++ b/Tests/CMakeTests/FileDownloadBadHashTest.cmake.in @@ -1,4 +1,7 @@ -set(url "file://@CMAKE_CURRENT_SOURCE_DIR@/FileDownloadInput.png") +if(NOT "@CMAKE_CURRENT_SOURCE_DIR@" MATCHES "^/") + set(slash /) +endif() +set(url "file://${slash}@CMAKE_CURRENT_SOURCE_DIR@/FileDownloadInput.png") set(dir "@CMAKE_CURRENT_BINARY_DIR@/downloads") file(DOWNLOAD diff --git a/Tests/CMakeTests/FileDownloadTest.cmake.in b/Tests/CMakeTests/FileDownloadTest.cmake.in index 83ade2b..f6d9ad9 100644 --- a/Tests/CMakeTests/FileDownloadTest.cmake.in +++ b/Tests/CMakeTests/FileDownloadTest.cmake.in @@ -1,4 +1,7 @@ -set(url "file://@CMAKE_CURRENT_SOURCE_DIR@/FileDownloadInput.png") +if(NOT "@CMAKE_CURRENT_SOURCE_DIR@" MATCHES "^/") + set(slash /) +endif() +set(url "file://${slash}@CMAKE_CURRENT_SOURCE_DIR@/FileDownloadInput.png") set(dir "@CMAKE_CURRENT_BINARY_DIR@/downloads") message(STATUS "FileDownload:1") diff --git a/Tests/CMakeTests/FileUploadTest.cmake.in b/Tests/CMakeTests/FileUploadTest.cmake.in index 8577aef..9e22909 100644 --- a/Tests/CMakeTests/FileUploadTest.cmake.in +++ b/Tests/CMakeTests/FileUploadTest.cmake.in @@ -10,7 +10,10 @@ endif() file(MAKE_DIRECTORY "@CMAKE_CURRENT_BINARY_DIR@/uploads") set(filename "@CMAKE_CURRENT_SOURCE_DIR@/FileDownloadInput.png") -set(urlbase "file://@CMAKE_CURRENT_BINARY_DIR@/uploads") +if(NOT "@CMAKE_CURRENT_BINARY_DIR@" MATCHES "^/") + set(slash /) +endif() +set(urlbase "file://${slash}@CMAKE_CURRENT_BINARY_DIR@/uploads") message(STATUS "FileUpload:1") file(UPLOAD |