diff options
| author | Martin Matuska <martin@matuska.org> | 2019-04-03 23:13:35 +0200 |
|---|---|---|
| committer | Martin Matuska <martin@matuska.org> | 2019-04-04 00:11:32 +0200 |
| commit | 7f7c83316849b5d24b93ace5c69ad39f539d26b1 (patch) | |
| tree | e456db190d069ae5ed75b5ca1abd42a00f83df57 /libarchive/test | |
| parent | c1824937fddd931a82814cf51fb3308fa65bffaf (diff) | |
| download | libarchive-7f7c83316849b5d24b93ace5c69ad39f539d26b1.tar.gz | |
Fix various symlink bugs with Windows symlinks
tests: extend assertMakeSymlink with targetIsDir
Diffstat (limited to 'libarchive/test')
| -rw-r--r-- | libarchive/test/test_read_disk_directory_traversals.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libarchive/test/test_read_disk_directory_traversals.c b/libarchive/test/test_read_disk_directory_traversals.c index 82579b23..1e41c3ca 100644 --- a/libarchive/test/test_read_disk_directory_traversals.c +++ b/libarchive/test/test_read_disk_directory_traversals.c @@ -570,13 +570,13 @@ test_symlink_hybrid(void) assertMakeDir("h", 0755); assertChdir("h"); assertMakeDir("d1", 0755); - assertMakeSymlink("ld1", "d1/"); + assertMakeSymlink("ld1", "d1", 1); assertMakeFile("d1/file1", 0644, "d1/file1"); assertMakeFile("d1/file2", 0644, "d1/file2"); - assertMakeSymlink("d1/link1", "file1"); - assertMakeSymlink("d1/linkX", "fileX"); - assertMakeSymlink("link2", "d1/file2"); - assertMakeSymlink("linkY", "d1/fileY"); + assertMakeSymlink("d1/link1", "file1", 0); + assertMakeSymlink("d1/linkX", "fileX", 0); + assertMakeSymlink("link2", "d1/file2", 0); + assertMakeSymlink("linkY", "d1/fileY", 0); assertChdir(".."); assert((ae = archive_entry_new()) != NULL); @@ -727,13 +727,13 @@ test_symlink_logical(void) assertMakeDir("l", 0755); assertChdir("l"); assertMakeDir("d1", 0755); - assertMakeSymlink("ld1", "d1/"); + assertMakeSymlink("ld1", "d1", 1); assertMakeFile("d1/file1", 0644, "d1/file1"); assertMakeFile("d1/file2", 0644, "d1/file2"); - assertMakeSymlink("d1/link1", "file1"); - assertMakeSymlink("d1/linkX", "fileX"); - assertMakeSymlink("link2", "d1/file2"); - assertMakeSymlink("linkY", "d1/fileY"); + assertMakeSymlink("d1/link1", "file1", 0); + assertMakeSymlink("d1/linkX", "fileX", 0); + assertMakeSymlink("link2", "d1/file2", 0); + assertMakeSymlink("linkY", "d1/fileY", 0); assertChdir(".."); /* Note: this test uses archive_read_next_header() @@ -961,8 +961,8 @@ test_symlink_logical_loop(void) assertMakeDir("d1/d2/d3", 0755); assertMakeDir("d2", 0755); assertMakeFile("d2/file1", 0644, "d2/file1"); - assertMakeSymlink("d1/d2/ld1", "../../d1/"); - assertMakeSymlink("d1/d2/ld2", "../../d2/"); + assertMakeSymlink("d1/d2/ld1", "../../d1", 1); + assertMakeSymlink("d1/d2/ld2", "../../d2", 1); assertChdir(".."); assert((ae = archive_entry_new()) != NULL); |