Add patch to skip one build-time test if /var/tmp cannot support xattrs, for example if it is on tmpfs

This commit is contained in:
Simon McVittie 2016-03-11 09:11:01 +00:00
parent 934f62cb2a
commit 3623c14b77
3 changed files with 36 additions and 0 deletions

2
debian/changelog vendored
View File

@ -32,6 +32,8 @@ ostree (2016.3-1) UNRELEASED; urgency=medium
* Only build on Linux architectures; this package is specifically
not portable
* Add patch to fix underlinking of test-archive
* Add patch to skip one build-time test if /var/tmp cannot support xattrs,
for example if it is on tmpfs
-- Simon McVittie <smcv@debian.org> Wed, 27 Jan 2016 13:04:34 +0100

View File

@ -0,0 +1,33 @@
From: Simon McVittie <smcv@debian.org>
Date: Fri, 11 Mar 2016 09:09:48 +0000
Subject: Skip test_libarchive_ignore_device_file if we cannot write xattrs
The test tries to get a filesystem that supports xattrs by writing
to /var/tmp, but in some automated build environments the entire
build chroot is on a tmpfs.
Signed-off-by: Simon McVittie <smcv@debian.org>
---
tests/test-libarchive-import.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/tests/test-libarchive-import.c b/tests/test-libarchive-import.c
index 928b149..877fa77 100644
--- a/tests/test-libarchive-import.c
+++ b/tests/test-libarchive-import.c
@@ -193,6 +193,15 @@ test_libarchive_ignore_device_file (gconstpointer data)
glnx_unref_object GFile *root = NULL;
g_autofree char *commit_checksum = NULL;
+ if (setxattr (td->tmpd, "user.test-xattr-support", "yes", 4, 0) != 0)
+ {
+ int saved_errno = errno;
+ g_autofree gchar *message = g_strdup_printf ("unable to setxattr on \"%s\": %s", td->tmpd, g_strerror (saved_errno));
+
+ g_test_skip (message);
+ goto out;
+ }
+
g_assert_cmpint (0, ==, lseek (td->fd, 0, SEEK_SET));
g_assert_cmpint (0, ==, archive_read_support_format_all (a));
g_assert_cmpint (0, ==, archive_read_support_filter_all (a));

View File

@ -1 +1,2 @@
test-libarchive-fix-underlinking.patch
Skip-test_libarchive_ignore_device_file-if-we-cannot-writ.patch