From fbc234034273a939b9a34c40be4b97c2770dbedd Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sun, 26 Jun 2016 14:29:31 +0100 Subject: [PATCH] Skip more tests if /var/tmp doesn't support extended attributes --- debian/changelog | 2 ++ ...elper-these-tests-need-extended-attr.patch | 23 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 26 insertions(+) create mode 100644 debian/patches/entry_pathname_test_helper-these-tests-need-extended-attr.patch diff --git a/debian/changelog b/debian/changelog index df5783b6..903f5dde 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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: add patches to ensure that the build-time tests act on the copy 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 Wed, 15 Jun 2016 14:05:53 -0400 diff --git a/debian/patches/entry_pathname_test_helper-these-tests-need-extended-attr.patch b/debian/patches/entry_pathname_test_helper-these-tests-need-extended-attr.patch new file mode 100644 index 00000000..8b38039b --- /dev/null +++ b/debian/patches/entry_pathname_test_helper-these-tests-need-extended-attr.patch @@ -0,0 +1,23 @@ +From: Simon McVittie +Date: Sun, 26 Jun 2016 14:26:37 +0100 +Subject: entry_pathname_test_helper: these tests need extended attributes + +Signed-off-by: Simon McVittie +--- + 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); diff --git a/debian/patches/series b/debian/patches/series index 0adf62ae..3f8a7fb5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ libostree.sym-Fix-test-symbols.patch pull-Correctly-handle-repo-parent_repo-when-applying-stat.patch tests-use-our-own-generated-libtool-not-the-one-in-PATH.patch tests-fail-the-build-if-symlinking-tests-ostree-fails.patch +entry_pathname_test_helper-these-tests-need-extended-attr.patch