From 6e5bd6187c3ad2529a85f1ea063b13695c05b91b Mon Sep 17 00:00:00 2001 From: Johannes Sixt Date: Mon, 8 Jan 2007 18:29:04 +0100 Subject: [PATCH] Even more tests to skip due to missing symbolic link support. --- t/t3200-branch.sh | 2 ++ t/t4004-diff-rename-symlink.sh | 7 +++++++ t/t4008-diff-break-rewrite.sh | 4 ++++ t/t4011-diff-symlink.sh | 7 +++++++ t/t4115-apply-symlink.sh | 7 +++++++ t/t5000-tar-tree.sh | 7 +++++++ 6 files changed, 34 insertions(+) diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index bb80e4286a..258b0c1658 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -110,11 +110,13 @@ test_expect_success 'config information was renamed, too' \ "test $(git-repo-config branch.s.dummy) = Hello && ! git-repo-config branch.s/s/dummy" +test "$no_symlinks" || { test_expect_failure \ 'git-branch -m u v should fail when the reflog for u is a symlink' \ 'git-branch -l u && mv .git/logs/refs/heads/u real-u && ln -s real-u .git/logs/refs/heads/u && git-branch -m u v' +} test_done diff --git a/t/t4004-diff-rename-symlink.sh b/t/t4004-diff-rename-symlink.sh index a23aaa0a94..61b0fc7cab 100755 --- a/t/t4004-diff-rename-symlink.sh +++ b/t/t4004-diff-rename-symlink.sh @@ -12,6 +12,13 @@ by an edit for them. . ./test-lib.sh . ../diff-lib.sh +if test "$no_symlinks" +then + say 'Symbolic links not supported, skipping tests.' + test_done + exit +fi + test_expect_success \ 'prepare reference tree' \ 'echo xyzzy | tr -d '\\\\'012 >yomin && diff --git a/t/t4008-diff-break-rewrite.sh b/t/t4008-diff-break-rewrite.sh index 263ac1ebf7..f0c853af29 100755 --- a/t/t4008-diff-break-rewrite.sh +++ b/t/t4008-diff-break-rewrite.sh @@ -99,6 +99,8 @@ test_expect_success \ 'validate result of -B -M (#4)' \ 'compare_diff_raw expected current' +test "$no_symlinks" || { + test_expect_success \ 'make file0 into something completely different' \ 'rm -f file0 && @@ -148,6 +150,8 @@ test_expect_success \ 'validate result of -M (#7)' \ 'compare_diff_raw expected current' +} # end symlink tests + test_expect_success \ 'file1 edited to look like file0 and file0 rename-edited to file2' \ 'rm -f file0 file1 && diff --git a/t/t4011-diff-symlink.sh b/t/t4011-diff-symlink.sh index 379a831f0b..2e415c0816 100755 --- a/t/t4011-diff-symlink.sh +++ b/t/t4011-diff-symlink.sh @@ -9,6 +9,13 @@ test_description='Test diff of symlinks. . ./test-lib.sh . ../diff-lib.sh +if test "$no_symlinks" +then + say 'Symbolic links not supported, skipping tests.' + test_done + exit +fi + cat > expected << EOF diff --git a/frotz b/frotz new file mode 120000 diff --git a/t/t4115-apply-symlink.sh b/t/t4115-apply-symlink.sh index d5f2cfb186..524d72f0dd 100755 --- a/t/t4115-apply-symlink.sh +++ b/t/t4115-apply-symlink.sh @@ -9,6 +9,13 @@ test_description='git-apply symlinks and partial files . ./test-lib.sh +if test "$no_symlinks" +then + say 'Symbolic links not supported, skipping tests.' + test_done + exit +fi + test_expect_success setup ' ln -s path1/path2/path3/path4/path5 link1 && diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh index cf08e9279c..fcfa7e4e41 100755 --- a/t/t5000-tar-tree.sh +++ b/t/t5000-tar-tree.sh @@ -28,6 +28,13 @@ commit id embedding: TAR=${TAR:-tar} UNZIP=${UNZIP:-unzip} +test "$no_symlinks" && { + function ln () { + test "$1" = -s && shift + date > "$2" + } +} + test_expect_success \ 'populate workdir' \ 'mkdir a b c && -- 2.11.4.GIT