Jelajahi Sumber

Merge topic 'fix-gcov-test'

0ccaa7ecb9 Tests: Fix GCOV test in unusual environments

Acked-by: Kitware Robot <[email protected]>
Merge-request: !7580
Brad King 3 tahun lalu
induk
melakukan
2216826ff8
1 mengubah file dengan 3 tambahan dan 2 penghapusan
  1. 3 2
      Tests/CTestCoverageCollectGCOV/test.cmake.in

+ 3 - 2
Tests/CTestCoverageCollectGCOV/test.cmake.in

@@ -34,9 +34,10 @@ set(expected_out
 # then back to relative to get them in canonical form (or maybe this is a bug
 # in how the tarball is generated?)
 function(to_relative_paths real_paths paths)
+  file(REAL_PATH "${CTEST_BINARY_DIRECTORY}" base)
   foreach(file ${paths})
-    file(REAL_PATH "${file}" real_path BASE_DIRECTORY "${CTEST_BINARY_DIRECTORY}")
-    file(RELATIVE_PATH relative_path "${CTEST_BINARY_DIRECTORY}" "${real_path}")
+    file(REAL_PATH "${file}" real_path BASE_DIRECTORY "${base}")
+    file(RELATIVE_PATH relative_path "${base}" "${real_path}")
     list(APPEND local_real_paths "${relative_path}")
     message(DEBUG "${file} -> ${real_path} -> ${relative_path}")
   endforeach()