Skip more tests if /var/tmp doesn't support extended attributes

This commit is contained in:
Simon McVittie 2016-06-26 14:29:31 +01:00
parent b77f68a4c2
commit fbc2340342
3 changed files with 26 additions and 0 deletions

2
debian/changelog vendored
View File

@ -20,6 +20,8 @@ ostree (2016.6-1) UNRELEASED; urgency=medium
d/p/tests-use-our-own-generated-libtool-not-the-one-in-PATH.patch: d/p/tests-use-our-own-generated-libtool-not-the-one-in-PATH.patch:
add patches to ensure that the build-time tests act on the copy add patches to ensure that the build-time tests act on the copy
of ostree that we just built of ostree that we just built
* d/p/entry_pathname_test_helper-these-tests-need-extended-attr.patch:
skip more tests if /var/tmp doesn't support extended attributes
-- Simon McVittie <smcv@debian.org> Wed, 15 Jun 2016 14:05:53 -0400 -- Simon McVittie <smcv@debian.org> Wed, 15 Jun 2016 14:05:53 -0400

View File

@ -0,0 +1,23 @@
From: Simon McVittie <smcv@debian.org>
Date: Sun, 26 Jun 2016 14:26:37 +0100
Subject: entry_pathname_test_helper: these tests need extended attributes
Signed-off-by: Simon McVittie <smcv@debian.org>
---
tests/test-libarchive-import.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tests/test-libarchive-import.c b/tests/test-libarchive-import.c
index aaa3c37..3ef379e 100644
--- a/tests/test-libarchive-import.c
+++ b/tests/test-libarchive-import.c
@@ -433,6 +433,9 @@ entry_pathname_test_helper (gconstpointer data, gboolean on)
OstreeRepoCommitModifier *modifier = NULL;
gboolean met_etc_file = FALSE;
+ if (skip_if_no_xattr (td))
+ goto out;
+
modifier = ostree_repo_commit_modifier_new (0, NULL, NULL, NULL);
ostree_repo_commit_modifier_set_xattr_callback (modifier, path_cb,
NULL, &met_etc_file);

View File

@ -2,3 +2,4 @@ libostree.sym-Fix-test-symbols.patch
pull-Correctly-handle-repo-parent_repo-when-applying-stat.patch pull-Correctly-handle-repo-parent_repo-when-applying-stat.patch
tests-use-our-own-generated-libtool-not-the-one-in-PATH.patch tests-use-our-own-generated-libtool-not-the-one-in-PATH.patch
tests-fail-the-build-if-symlinking-tests-ostree-fails.patch tests-fail-the-build-if-symlinking-tests-ostree-fails.patch
entry_pathname_test_helper-these-tests-need-extended-attr.patch