From 2c1dc4dac4513abe8c93f1475447b1e7eb307ddd Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 25 Apr 2016 12:51:45 +0100 Subject: [PATCH] Add a patch to skip the test-parent test if /var/tmp doesn't support user xattrs, hopefully fixing FTBFS on x86-csail-02 buildd --- debian/changelog | 7 ++++++ debian/patches/series | 1 + ...arent-this-test-requires-user-xattrs.patch | 22 +++++++++++++++++++ 3 files changed, 30 insertions(+) create mode 100644 debian/patches/test-parent-this-test-requires-user-xattrs.patch diff --git a/debian/changelog b/debian/changelog index 12f940dc..7f16f028 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ostree (2016.5-2) experimental; urgency=medium + + * Add a patch to skip the test-parent test if /var/tmp doesn't support + user xattrs, hopefully fixing FTBFS on x86-csail-02 buildd + + -- Simon McVittie Mon, 25 Apr 2016 12:51:33 +0100 + ostree (2016.5-1) experimental; urgency=medium * New upstream release diff --git a/debian/patches/series b/debian/patches/series index bccdff56..6fd88097 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ libtest-show-files-contents-when-assertions-about-them-fa.patch +test-parent-this-test-requires-user-xattrs.patch diff --git a/debian/patches/test-parent-this-test-requires-user-xattrs.patch b/debian/patches/test-parent-this-test-requires-user-xattrs.patch new file mode 100644 index 00000000..825341e0 --- /dev/null +++ b/debian/patches/test-parent-this-test-requires-user-xattrs.patch @@ -0,0 +1,22 @@ +From: Simon McVittie +Date: Mon, 25 Apr 2016 12:50:32 +0100 +Subject: test-parent: this test requires user xattrs + +Signed-off-by: Simon McVittie +--- + tests/test-parent.sh | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tests/test-parent.sh b/tests/test-parent.sh +index 05b102a..d1f5d7c 100755 +--- a/tests/test-parent.sh ++++ b/tests/test-parent.sh +@@ -21,6 +21,8 @@ set -euo pipefail + + . $(dirname $0)/libtest.sh + ++skip_without_user_xattrs ++ + echo '1..2' + + setup_test_repository "archive-z2"