From c6f17a04481f265b4eaca8e3fa586d7ba2461a35 Mon Sep 17 00:00:00 2001 From: Martin Matuska Date: Fri, 20 Aug 2021 11:58:41 +0200 Subject: [PATCH] Add ability to skip atime test in directory traversals --- .cirrus.yml | 2 +- libarchive/test/test_read_disk_directory_traversals.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 4d01154a3..f882d1451 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -23,7 +23,7 @@ FreeBSD_task: build_script: - ./build/ci/build.sh -a build test_script: - - ./build/ci/build.sh -a test + - env SKIP_TEST_RESTORE_ATIME=1 ./build/ci/build.sh -a test - ./build/ci/cirrus_ci/ci.sh test install_script: - ./build/ci/build.sh -a install diff --git a/libarchive/test/test_read_disk_directory_traversals.c b/libarchive/test/test_read_disk_directory_traversals.c index d24d14369..bca3ce518 100644 --- a/libarchive/test/test_read_disk_directory_traversals.c +++ b/libarchive/test/test_read_disk_directory_traversals.c @@ -1047,7 +1047,14 @@ test_restore_atime(void) size_t size; int64_t offset; int file_count; - + const char *skip_test_restore_atime; + + skip_test_restore_atime = getenv("SKIP_TEST_RESTORE_ATIME"); + if (skip_test_restore_atime != NULL) { + skipping("Skipping restore atime tests due to " + "SKIP_TEST_RESTORE_ATIME environment variable"); + return; + } if (!atimeIsUpdated()) { skipping("Can't test restoring atime on this filesystem"); return; -- 2.47.2