diff options
author | mm <mm@FreeBSD.org> | 2016-10-31 21:57:18 +0000 |
---|---|---|
committer | mm <mm@FreeBSD.org> | 2016-10-31 21:57:18 +0000 |
commit | 47fbb22e6a60da9ba4d20c53e5cff87976ef6f39 (patch) | |
tree | 22ddbe3ec622a22e9f448cbb402c0775f9de2763 /contrib/libarchive/tar | |
parent | 476945987212f4ea15a4100f0c0c7800228f28db (diff) | |
download | FreeBSD-src-47fbb22e6a60da9ba4d20c53e5cff87976ef6f39.zip FreeBSD-src-47fbb22e6a60da9ba4d20c53e5cff87976ef6f39.tar.gz |
MFC r307861:
Update libarchive to 3.2.2
Most of the post-3.2.1 fixes have already been merged. This update contains
just the version bump and some fixes to the test framework.
Diffstat (limited to 'contrib/libarchive/tar')
-rw-r--r-- | contrib/libarchive/tar/test/main.c | 4 | ||||
-rw-r--r-- | contrib/libarchive/tar/test/test.h | 2 | ||||
-rw-r--r-- | contrib/libarchive/tar/test/test_option_b.c | 2 | ||||
-rw-r--r-- | contrib/libarchive/tar/test/test_symlink_dir.c | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/contrib/libarchive/tar/test/main.c b/contrib/libarchive/tar/test/main.c index 7a035fe..6bffee2 100644 --- a/contrib/libarchive/tar/test/main.c +++ b/contrib/libarchive/tar/test/main.c @@ -1188,7 +1188,7 @@ assertion_file_contains_no_invalid_strings(const char *file, int line, return(0); } } - + free(buff); return (0); } @@ -1412,6 +1412,8 @@ assertion_file_mode(const char *file, int line, const char *pathname, int expect assertion_count(file, line); #if defined(_WIN32) && !defined(__CYGWIN__) failure_start(file, line, "assertFileMode not yet implemented for Windows"); + (void)mode; /* UNUSED */ + (void)r; /* UNUSED */ #else { struct stat st; diff --git a/contrib/libarchive/tar/test/test.h b/contrib/libarchive/tar/test/test.h index d8bdf28..c002a2c 100644 --- a/contrib/libarchive/tar/test/test.h +++ b/contrib/libarchive/tar/test/test.h @@ -244,7 +244,7 @@ int assertion_file_atime_recent(const char *, int, const char *); int assertion_file_birthtime(const char *, int, const char *, long, long); int assertion_file_birthtime_recent(const char *, int, const char *); int assertion_file_contains_lines_any_order(const char *, int, const char *, const char **); -int assertion_file_contains_no_invalid_strings(const char *, int, const char *, const char **); +int assertion_file_contains_no_invalid_strings(const char *, int, const char *, const char **); int assertion_file_contents(const char *, int, const void *, int, const char *); int assertion_file_exists(const char *, int, const char *); int assertion_file_mode(const char *, int, const char *, int); diff --git a/contrib/libarchive/tar/test/test_option_b.c b/contrib/libarchive/tar/test/test_option_b.c index 81f50be..7c2f604 100644 --- a/contrib/libarchive/tar/test/test_option_b.c +++ b/contrib/libarchive/tar/test/test_option_b.c @@ -33,7 +33,7 @@ DEFINE_TEST(test_option_b) assertMakeFile("file1", 0644, "file1"); if (systemf("cat file1 > test_cat.out 2> test_cat.err") != 0) { - skipping("Platform doesn't have cat"); + skipping("This test requires a `cat` program"); return; } testprog_ustar = malloc(strlen(testprog) + sizeof(USTAR_OPT) + 1); diff --git a/contrib/libarchive/tar/test/test_symlink_dir.c b/contrib/libarchive/tar/test/test_symlink_dir.c index 96bc3a4..ba643c2 100644 --- a/contrib/libarchive/tar/test/test_symlink_dir.c +++ b/contrib/libarchive/tar/test/test_symlink_dir.c @@ -63,7 +63,7 @@ DEFINE_TEST(test_symlink_dir) /* "dir2" is a symlink to a non-existing "real_dir2" */ assertMakeSymlink("dest1/dir2", "real_dir2"); } else { - skipping("some symlink checks"); + skipping("Symlinks are not supported on this platform"); } /* "dir3" is a symlink to an existing "non_dir3" */ assertMakeFile("dest1/non_dir3", 0755, "abcdef"); |