diff options
author | Marc Chevrier <marc.chevrier@gmail.com> | 2021-01-15 10:46:55 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2021-01-15 10:47:02 (GMT) |
commit | 50b8dc8735e836658755e6dc3dc2a9f00e1006e1 (patch) | |
tree | 73c5e6ffc7b0383e539d034d6e7fca56fc9e21d6 /Tests | |
parent | e6b6e457a0e8d33402bc7d64d85b20a8ca0546a0 (diff) | |
parent | 76f0bcdfb6e04f1f6089ea693d69b642bbf26e82 (diff) | |
download | CMake-50b8dc8735e836658755e6dc3dc2a9f00e1006e1.zip CMake-50b8dc8735e836658755e6dc3dc2a9f00e1006e1.tar.gz CMake-50b8dc8735e836658755e6dc3dc2a9f00e1006e1.tar.bz2 |
Merge topic 'cmake_path-stabilization'
76f0bcdfb6 cmake_path: various updates
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5695
Diffstat (limited to 'Tests')
-rw-r--r-- | Tests/RunCMake/cmake_path/HASH.cmake | 5 | ||||
-rw-r--r-- | Tests/RunCMake/cmake_path/IS_PREFIX.cmake | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Tests/RunCMake/cmake_path/HASH.cmake b/Tests/RunCMake/cmake_path/HASH.cmake index dfcf2b2..eb04f7f 100644 --- a/Tests/RunCMake/cmake_path/HASH.cmake +++ b/Tests/RunCMake/cmake_path/HASH.cmake @@ -14,11 +14,6 @@ set (path1 "a///b/c/../d") cmake_path(HASH path1 hash1) set (path2 "a/b////d") cmake_path(HASH path2 hash2) -if (hash1 STREQUAL hash2) - list (APPEND errors "'hash values equal for '${path1}' and '${path2}'") -endif() -cmake_path(HASH path1 hash1 NORMALIZE) -cmake_path(HASH path2 NORMALIZE hash2) if (NOT hash1 STREQUAL hash2) list (APPEND errors "'hash values not equal for '${path1}' and '${path2}'") endif() diff --git a/Tests/RunCMake/cmake_path/IS_PREFIX.cmake b/Tests/RunCMake/cmake_path/IS_PREFIX.cmake index 53da93b..9160dab 100644 --- a/Tests/RunCMake/cmake_path/IS_PREFIX.cmake +++ b/Tests/RunCMake/cmake_path/IS_PREFIX.cmake @@ -18,5 +18,10 @@ if (NOT output) list (APPEND errors "'${path} is not prefix of 'a/b/d/e'") endif() +set(path "/a/b/..") +cmake_path(IS_PREFIX path "/a/c/../b" NORMALIZE output) +if (NOT output) + list (APPEND errors "'${path} is not prefix of '/a/c/../b'") +endif() check_errors (IS_PREFIX ${errors}) |