Merge pull request #243 from Gottox/fix/obsd-test

Fix/obsd test
Gottox · May 30, 2024 · 5717441 · 5717441
2 parents 7d85f0b + 72a675e
commit 5717441
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -194,11 +194,11 @@ jobs:
           - arm64
     steps:
     - uses: actions/checkout@v4
-    - uses: "cross-platform-actions/action@v0.19.0"
+    - uses: "cross-platform-actions/action@v0.24.0"
       with:
         operating_system: openbsd
         architecture: ${{ matrix.arch }}
-        version: 7.2
+        version: 7.5
         run: |
           sudo pkg_add git meson squashfs-tools curl lz4 xz zstd
           CC=clang meson setup /tmp/build \

diff --git a/test/libsqsh/integration.c b/test/libsqsh/integration.c
@@ -418,6 +418,7 @@ UTEST(integration, sqsh_test_extended_dir) {
 	ASSERT_EQ(0, rv);
 }
 
+#ifndef __OpenBSD__
 UTEST(integration, sqsh_test_xattr) {
 	const char *expected_value = "1234567891234567891234567890001234567890";
 	int rv;
@@ -523,6 +524,7 @@ UTEST(integration, sqsh_test_xattr) {
 	rv = sqsh__archive_cleanup(&sqsh);
 	ASSERT_EQ(0, rv);
 }
+#endif
 
 struct Walker {
 	struct SqshArchive *sqsh;

diff --git a/test/libsqsh/integration_create.sh b/test/libsqsh/integration_create.sh
@@ -13,11 +13,15 @@ cat > $tmp/pf <<EOF
 "a" F 0 777 2020 202020 echo a
 "b" F 0 777 2020 202020 seq 1 1050000 | head -1050000 | tr -cd "\n" | tr '\n' b
 "large_dir" D 0 777 2020 202020
+"large_dir/link" s 777 2020 202020 ..
+EOF
+if [ `uname` != "OpenBSD" ]; then
+	cat >> $tmp/pf <<EOF
 "large_dir" x user.force_extended=true
 "a" x user.foo=1234567891234567891234567890001234567890
 "b" x user.bar=1234567891234567891234567890001234567890
-"large_dir/link" s 777 2020 202020 ..
 EOF
+fi
 
 for i in $(seq 1 1000); do
 	printf '"large_dir/%i" I 0 777 2020 202020 f\n' "$i" >> $tmp/pf