gcovr · Spacetown · Mar 8, 2023 · Feb 5, 2023 · Feb 5, 2023 · Feb 8, 2023
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -50,6 +50,7 @@ Bug fixes and small improvements:
 - Fix casing of files if filesystem is case insensitive. (:issue:`694`)
 - Fix deadlock if :option:`-j` is used and there are errors from ``gcov`` execution. (:issue:`719`)
 - Fix problem in decision parser if case is not on a single line with the break statement. (:issue:`738`)
+- Do not use ``realpath`` for ``DirectoryPrefixFilter`` to support symlinks in root directory. (:issue:`712`)
 
 Documentation:
 

diff --git a/gcovr/__main__.py b/gcovr/__main__.py
@@ -266,16 +266,6 @@ def main(args=None):
 
     options.starting_dir = os.path.abspath(os.getcwd())
     options.root_dir = os.path.abspath(options.root)
-    root_dir_realpath = os.path.realpath(options.root_dir)
-    if options.root_dir != root_dir_realpath and not options.filter:
-        logger.warning(
-            "Your project --root directory seems to contain a symlink. "
-            "This will EXCLUDE source files in your root directory! "
-            "To fix this, you may have to add a --filter option:\n"
-            "    --filter='%s'\n"
-            "For details, see https://github.com/gcovr/gcovr/issues/635",
-            re.escape(root_dir_realpath),
-        )
 
     #
     # Setup filters

diff --git a/gcovr/tests/symlink-root/Makefile b/gcovr/tests/symlink-root/Makefile
@@ -9,9 +9,7 @@ run: txt
 
 txt:
 	cd symlink; ./testcase
-	cd symlink; $(GCOVR) --txt ../coverage.txt --root $${PWD} > out.log 2>&1
-	cd symlink; cat out.log
-	cd symlink; grep -F "Your project --root directory seems to contain a symlink." out.log
+	cd symlink; $(GCOVR) --txt ../coverage.txt --root $${PWD}
 
 clean:
 ifeq ($(filter $(BASE_OS),MSYS_NT MINGW64_NT),)

diff --git a/gcovr/tests/symlink-root/reference/clang-10/coverage.txt b/gcovr/tests/symlink-root/reference/clang-10/coverage.txt
@@ -4,6 +4,7 @@ Directory: ../symlink
 ------------------------------------------------------------------------------
 File                                       Lines    Exec  Cover   Missing
 ------------------------------------------------------------------------------
+main.cpp                                       2       2   100%
 ------------------------------------------------------------------------------
-TOTAL                                          0       0    --%
+TOTAL                                          2       2   100%
 ------------------------------------------------------------------------------
diff --git a/gcovr/tests/symlink-root/reference/gcc-5/coverage.txt b/gcovr/tests/symlink-root/reference/gcc-5/coverage.txt
@@ -4,6 +4,7 @@ Directory: ../symlink
 ------------------------------------------------------------------------------
 File                                       Lines    Exec  Cover   Missing
 ------------------------------------------------------------------------------
+main.cpp                                       2       2   100%
 ------------------------------------------------------------------------------
-TOTAL                                          0       0    --%
+TOTAL                                          2       2   100%
 ------------------------------------------------------------------------------
diff --git a/gcovr/tests/test_gcovr.py b/gcovr/tests/test_gcovr.py
@@ -301,12 +301,6 @@ def pytest_generate_tests(metafunc):
                     name == "cmake_gtest" and not GCOVR_ISOLATED_TEST,
                     reason="only available in docker",
                 ),
-                pytest.mark.skipif(
-                    name == "symlink-root"
-                    and IS_WINDOWS
-                    and (sys.version_info < (3, 8)),
-                    reason="os.path.realpath resolves symlinks on windows starting with 3.8",
-                ),
                 pytest.mark.xfail(
                     name == "exclude-throw-branches"
                     and format == "html"

diff --git a/gcovr/utils.py b/gcovr/utils.py
@@ -280,14 +280,13 @@ def match(self, path):
 
 class DirectoryPrefixFilter(Filter):
     def __init__(self, directory):
-        path = realpath(directory)
-        os_independent_path = get_os_independent_path(path)
+        os_independent_path = get_os_independent_path(directory)
         pattern = re.escape(f"{os_independent_path}/")
         super().__init__(pattern)
 
     def match(self, path: str):
-        realpath = os.path.normpath(path)
-        return super().match(realpath)
+        path = os.path.normpath(path)
+        return super().match(path)
 
 
 def configure_logging() -> None: