From: Martin Matuska <martin@matuska.org>
Date: Sun, 17 Nov 2019 23:11:37 +0000 (+0100)
Subject: test_open_fd: skip error test on GitHub Actions
X-Git-Tag: v3.4.1~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c37e9567c39e5970f68736b55ac454798f638736;p=thirdparty%2Flibarchive.git

test_open_fd: skip error test on GitHub Actions
---

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 11fa1b6b8..fc709d0b1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,6 +31,7 @@ jobs:
       run: ./build/ci/build.sh -a test
       env:
         BS: ${{ matrix.bs }}
+        SKIP_OPEN_FD_ERR_TEST: 1
     - name: Install
       run: ./build/ci/build.sh -a install
       env:
diff --git a/libarchive/test/test_open_fd.c b/libarchive/test/test_open_fd.c
index ff5fab1ad..7da8b5ebc 100644
--- a/libarchive/test/test_open_fd.c
+++ b/libarchive/test/test_open_fd.c
@@ -42,6 +42,7 @@ DEFINE_TEST(test_open_fd)
 	struct archive_entry *ae;
 	struct archive *a;
 	int fd;
+	const char *skip_open_fd_err_test;
 
 #if defined(__BORLANDC__)
 	fd = open("test.tar", O_RDWR | O_CREAT | O_BINARY);
@@ -116,16 +117,18 @@ DEFINE_TEST(test_open_fd)
 	assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 	close(fd);
 
-
-	/*
-	 * Verify some of the error handling.
-	 */
-	assert((a = archive_read_new()) != NULL);
-	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
-	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
-	/* FD 100 shouldn't be open. */
-	assertEqualIntA(a, ARCHIVE_FATAL,
-	    archive_read_open_fd(a, 100, 512));
-	assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
-	assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+	skip_open_fd_err_test = getenv("SKIP_OPEN_FD_ERR_TEST");
+	if(skip_open_fd_err_test == NULL) {
+		/*
+		 * Verify some of the error handling.
+		 */
+		assert((a = archive_read_new()) != NULL);
+		assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
+		assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
+		/* FD 100 shouldn't be open. */
+		assertEqualIntA(a, ARCHIVE_FATAL,
+		archive_read_open_fd(a, 100, 512));
+		assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
+		assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+	}
 }