diff options
Diffstat (limited to 'contrib/libarchive/libarchive/test/test_read_disk_directory_traversals.c')
| -rw-r--r-- | contrib/libarchive/libarchive/test/test_read_disk_directory_traversals.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/contrib/libarchive/libarchive/test/test_read_disk_directory_traversals.c b/contrib/libarchive/libarchive/test/test_read_disk_directory_traversals.c index bca3ce518e21..009c9a8db1e1 100644 --- a/contrib/libarchive/libarchive/test/test_read_disk_directory_traversals.c +++ b/contrib/libarchive/libarchive/test/test_read_disk_directory_traversals.c @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD$"); #include <limits.h> #if defined(_WIN32) && !defined(__CYGWIN__) @@ -1608,6 +1607,12 @@ test_parent(void) int file_count; int match_count; int r; +#if defined(O_PATH) || defined(O_SEARCH) || \ + (defined(__FreeBSD__) && defined(O_EXEC)) + const char *ignore_traversals_test4; + + ignore_traversals_test4 = getenv("IGNORE_TRAVERSALS_TEST4"); +#endif assertMakeDir("lock", 0311); assertMakeDir("lock/dir1", 0755); @@ -1784,7 +1789,8 @@ test_parent(void) if (r == ARCHIVE_FAILED) { #if defined(O_PATH) || defined(O_SEARCH) || \ (defined(__FreeBSD__) && defined(O_EXEC)) - assertEqualIntA(a, ARCHIVE_OK, r); + if (ignore_traversals_test4 == NULL) + assertEqualIntA(a, ARCHIVE_OK, r); #endif /* Close the disk object. */ archive_read_close(a); |