diff --git a/debian/changelog b/debian/changelog index 121b6820..32a8cfee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,8 @@ ostree (2016.15-3) UNRELEASED; urgency=medium The upstream build system now uses the intended permissions throughout. - Retain explicit chmod for *.js, which dh_fixperms assumes should not be executable. + * d/p/Fix-TAP-syntax-in-test-basic-user.sh-and-run-it.patch: + Run an additional test, which was previously installed but not run -- Simon McVittie Sun, 15 Jan 2017 14:37:12 +0000 diff --git a/debian/patches/Fix-TAP-syntax-in-test-basic-user.sh-and-run-it.patch b/debian/patches/Fix-TAP-syntax-in-test-basic-user.sh-and-run-it.patch new file mode 100644 index 00000000..c498f922 --- /dev/null +++ b/debian/patches/Fix-TAP-syntax-in-test-basic-user.sh-and-run-it.patch @@ -0,0 +1,51 @@ +From: Simon McVittie +Date: Thu, 19 Jan 2017 11:21:58 +0000 +Subject: Fix TAP syntax in test-basic-user.sh, and run it + +In its initial commit, Alexander Larsson wrote + + This works standalone, but unfortunately it breaks in + gnome-desktop-testing-runner as /tmp doesn't support + xattrs, so it is not installed atm. + +but we now (a) use /var/tmp, and (b) explicitly skip the test if +xattr support is unavailable. So it should be OK to run now. +--- + Makefile-tests.am | 2 +- + tests/test-basic-user.sh | 3 --- + 2 files changed, 1 insertion(+), 4 deletions(-) + +diff --git a/Makefile-tests.am b/Makefile-tests.am +index 1f9cad48..02668ed3 100644 +--- a/Makefile-tests.am ++++ b/Makefile-tests.am +@@ -44,6 +44,7 @@ dist_uninstalled_test_scripts = tests/test-symbols.sh + + dist_test_scripts = \ + tests/test-basic.sh \ ++ tests/test-basic-user.sh \ + tests/test-pull-subpath.sh \ + tests/test-archivez.sh \ + tests/test-remote-add.sh \ +@@ -118,7 +119,6 @@ dist_installed_test_data = tests/archive-test.sh \ + tests/pull-test.sh \ + tests/admin-test.sh \ + tests/basic-test.sh \ +- tests/test-basic-user.sh \ + tests/corrupt-repo-ref.js \ + tests/pre-endian-deltas-repo-big.tar.xz \ + tests/pre-endian-deltas-repo-little.tar.xz \ +diff --git a/tests/test-basic-user.sh b/tests/test-basic-user.sh +index 42e6a864..3e11545e 100755 +--- a/tests/test-basic-user.sh ++++ b/tests/test-basic-user.sh +@@ -23,9 +23,6 @@ set -euo pipefail + + skip_without_user_xattrs + +-echo "1..1" +- + setup_test_repository "bare-user" +-echo "ok setup" + + . $(dirname $0)/basic-test.sh diff --git a/debian/patches/series b/debian/patches/series index 0ab08635..bf0fb385 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ +Fix-TAP-syntax-in-test-basic-user.sh-and-run-it.patch Sourced-test-snippets-remove-shebang-and-make-non-executa.patch Make-corrupt-repo-ref.js-executable.patch