Add ability to skip atime test in directory traversals

diff --git a/.cirrus.yml b/.cirrus.yml
index 4d01154a34f854fce56ae0a97eccaf66034f02b1..f882d145191104c4549cdd40b2389985bc37781c 100644 (file)
--- 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 d24d1436974a02fe0a6a0b6a35cda2c5fb94b4eb..bca3ce518e2143a0dcea7e2d0d1a3759ca2f3541 100644 (file)
--- 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;