This is an automated email from the git hooks/post-receive script.

guillem pushed a commit to branch main
in repository dpkg.

View the commit online:
https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=fcce8d7e5de54b05fcbd4cbfdebec3131a6fbe76

commit fcce8d7e5de54b05fcbd4cbfdebec3131a6fbe76
Author: Guillem Jover <[email protected]>
AuthorDate: Thu Dec 2 05:20:48 2021 +0100

    test: For symlinks to directories consider the targets regular files
    
    Fixes: commit bb45176b9321eca536346fa6b0f4c641718c022f
    Fixes: commit 55b3e917344edc19610e83c14913ed86bf02d643
    Changelog: silent
---
 tests/t-filtering/Makefile                 | 2 +-
 tests/t-switch-dir-to-symlink-abs/Makefile | 6 +++---
 tests/t-switch-dir-to-symlink-rel/Makefile | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/t-filtering/Makefile b/tests/t-filtering/Makefile
index c60f6cc4e..01c7b9972 100644
--- a/tests/t-filtering/Makefile
+++ b/tests/t-filtering/Makefile
@@ -16,7 +16,7 @@ TEST_CASES += test-same-include-exclude
 TEST_CASES += test-upgrade test-help
 
 build-hook:
-       ln -fs pkg-somefiles pkg-somefiles/test/share/doc/pkg-symlinked
+       ln -fsT pkg-somefiles pkg-somefiles/test/share/doc/pkg-symlinked
 
 clean-hook:
        $(RM) pkg-somefiles/test/share/doc/pkg-symlinked
diff --git a/tests/t-switch-dir-to-symlink-abs/Makefile 
b/tests/t-switch-dir-to-symlink-abs/Makefile
index e285cfdd0..028cb9314 100644
--- a/tests/t-switch-dir-to-symlink-abs/Makefile
+++ b/tests/t-switch-dir-to-symlink-abs/Makefile
@@ -6,9 +6,9 @@ TESTS_DEB := \
 include ../Test.mk
 
 build-hook:
-       ln -sf test-dir pkg-dir-conffile-1/test-path
-       ln -sf test-dir pkg-dir-symlink-ext-1/test-path
-       ln -sf test-dir pkg-dir-symlink-int-1/test-path
+       ln -sfT test-dir pkg-dir-conffile-1/test-path
+       ln -sfT test-dir pkg-dir-symlink-ext-1/test-path
+       ln -sfT test-dir pkg-dir-symlink-int-1/test-path
 
 clean-hook:
        $(RM) pkg-dir-conffile-1/test-path
diff --git a/tests/t-switch-dir-to-symlink-rel/Makefile 
b/tests/t-switch-dir-to-symlink-rel/Makefile
index ae4056b69..833ac3832 100644
--- a/tests/t-switch-dir-to-symlink-rel/Makefile
+++ b/tests/t-switch-dir-to-symlink-rel/Makefile
@@ -7,11 +7,11 @@ include ../Test.mk
 
 build-hook:
        mkdir -p pkg-dir-conffile-1/test-path
-       ln -sf ../test-dir pkg-dir-conffile-1/test-path/test-subpath
+       ln -sfT ../test-dir pkg-dir-conffile-1/test-path/test-subpath
        mkdir -p pkg-dir-symlink-ext-1/test-path
-       ln -sf ../test-dir pkg-dir-symlink-ext-1/test-path/test-subpath
+       ln -sfT ../test-dir pkg-dir-symlink-ext-1/test-path/test-subpath
        mkdir -p pkg-dir-symlink-int-1/test-path
-       ln -sf ../test-dir pkg-dir-symlink-int-1/test-path/test-subpath
+       ln -sfT ../test-dir pkg-dir-symlink-int-1/test-path/test-subpath
 
 clean-hook:
        $(RM) pkg-dir-conffile-1/test-path/test-subpath

-- 
Dpkg.Org's dpkg

Reply via email to