reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-12-12 05:45:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tests: Fix file:// URLs given to curl

Browse Source 
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.
This commit is contained in:
Brad King 2017-02-07 14:25:49 -05:00
parent 73ae67006c
commit 14c771530a
6 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Tests/CMakeTests/FileDownloadBadHashTest.cmake.in
View File

@ -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") set(dir "@CMAKE_CURRENT_BINARY_DIR@/downloads")
file(DOWNLOAD file(DOWNLOAD

5
Tests/CMakeTests/FileDownloadTest.cmake.in
View File

@ -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") set(dir "@CMAKE_CURRENT_BINARY_DIR@/downloads")
message(STATUS "FileDownload:1") message(STATUS "FileDownload:1")

5
Tests/CMakeTests/FileUploadTest.cmake.in
View File

@ -10,7 +10,10 @@ endif()
file(MAKE_DIRECTORY "@CMAKE_CURRENT_BINARY_DIR@/uploads") file(MAKE_DIRECTORY "@CMAKE_CURRENT_BINARY_DIR@/uploads")
set(filename "@CMAKE_CURRENT_SOURCE_DIR@/FileDownloadInput.png") 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") message(STATUS "FileUpload:1")
file(UPLOAD file(UPLOAD

5
Tests/RunCMake/file/DOWNLOAD-hash-mismatch.cmake
View File

@ -1,5 +1,8 @@
if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" MATCHES "^/")
set(slash /)
endif()
file(DOWNLOAD file(DOWNLOAD
"file://${CMAKE_CURRENT_SOURCE_DIR}/DOWNLOAD-hash-mismatch.txt" "file://${slash}${CMAKE_CURRENT_SOURCE_DIR}/DOWNLOAD-hash-mismatch.txt"
${CMAKE_CURRENT_BINARY_DIR}/hash-mismatch.txt ${CMAKE_CURRENT_BINARY_DIR}/hash-mismatch.txt
EXPECTED_HASH SHA1=0123456789abcdef0123456789abcdef01234567 EXPECTED_HASH SHA1=0123456789abcdef0123456789abcdef01234567
STATUS status STATUS status

5
Tests/RunCMake/file/DOWNLOAD-unused-argument.cmake
View File

@ -1,5 +1,8 @@
if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" MATCHES "^/")
set(slash /)
endif()
file(DOWNLOAD file(DOWNLOAD
"file://${CMAKE_CURRENT_SOURCE_DIR}/DOWNLOAD-unused-argument.txt" "file://${slash}${CMAKE_CURRENT_SOURCE_DIR}/DOWNLOAD-unused-argument.txt"
"${CMAKE_CURRENT_BINARY_DIR}/unused-argument.txt" "${CMAKE_CURRENT_BINARY_DIR}/unused-argument.txt"
JUNK JUNK
) )

5
Tests/RunCMake/file/UPLOAD-unused-argument.cmake
View File

@ -1,5 +1,8 @@
if(NOT "${CMAKE_CURRENT_BINARY_DIR}" MATCHES "^/")
set(slash /)
endif()
file(UPLOAD file(UPLOAD
"${CMAKE_CURRENT_SOURCE_DIR}/UPLOAD-unused-argument.txt" "${CMAKE_CURRENT_SOURCE_DIR}/UPLOAD-unused-argument.txt"
"file://${CMAKE_CURRENT_BINARY_DIR}/unused-argument.txt" "file://${slash}${CMAKE_CURRENT_BINARY_DIR}/unused-argument.txt"
JUNK JUNK
) )