Commit Graph
100 Commits
Author SHA1 Message Date
Simon McVittie b76381eed1 Explicitly build-depend on xsltproc, which is directly used 2016-08-12 10:30:20 +01:00
Simon McVittie 109b2fe020 2016.7-1 2016-07-28 07:41:02 +01:00
Simon McVittie 7de140248e d/control: mention Flatpak, not its former name xdg-app 2016-07-17 09:33:43 +01:00
Simon McVittie 27ad263594 update symbols file for new ABI 2016-07-17 08:56:32 +01:00
Simon McVittie e2b411e934 build-depend on libsystemd (unconditionally, because this package is Linux-specific already) 2016-07-17 08:47:41 +01:00
Simon McVittie 134b42ee46 Add patch from upstream to make sure we use the built binaries for build-time testing 2016-07-16 21:16:11 +01:00
Simon McVittie 14a4beba63 New upstream version
- drop all patches, applied upstream
2016-07-16 21:08:02 +01:00
Simon McVittie 902c4c7b0f Merge tag 'upstream/2016.7' into debian/master
Upstream version 2016.7
2016-07-16 21:06:36 +01:00
Simon McVittie 8d0c193392 Imported Upstream version 2016.7 2016-07-16 21:06:34 +01:00
Simon McVittie e8a3585d78 Switch sense of check in debian/test.sh so we really ignore test failures on mipsel, and not on !mipsel. 2016-07-06 15:23:38 +01:00
Simon McVittie eb427ca1a3 2016.6-3 2016-07-06 10:17:56 +01:00
Simon McVittie 85d4d5e1cc Ignore build-time test failures on mipsel
"ostree pull" intermittently fails with a bus error on at least some
mipsel CPUs, and applying gdb to the resulting core dump does not produce
any useful information. Debugging help would be appreciated. (Mitigates:
#827473)
2016-07-04 10:06:55 +01:00
Simon McVittie 0187b51281 2016.6-2 2016-06-28 09:30:01 +01:00
Simon McVittie 7627fd4398 Use the GitHub repository as the Homepage and Source
The GNOME wiki page is less frequently updated.
2016-06-28 09:29:50 +01:00
Simon McVittie 65fccc367c Add patch from upstream fixing FTBFS on host machines without root= in /proc/cmdline
The reproducible builds armhf workers are one example.
2016-06-28 09:27:09 +01:00
Simon McVittie 0ed9f520da tests: fail the build if symlinking tests/ostree fails
Signed-off-by: Simon McVittie <smcv@debian.org>

Closes: #367
Approved by: cgwalters
2016-06-26 21:31:35 +00:00
Simon McVittie ca899ccfd3 tests: use our own generated libtool, not the one in $PATH
libtoolize creates a version of libtool for the right architecture
in $(top_builddir), which is guaranteed to be present, and is
guaranteed to match what we are compiling (even during
cross-compilation).

Packaging systems sometimes separate /usr/bin/libtool, which is
specific to one architecture, from the libtool development files
such as libtoolize and ltmain.sh, which are architecture-independent.
For example, in Debian, libtool_*_all.deb contains the files necessary
to libtoolize a package and is depended on by the dh-autoreconf package,
but libtool-bin_*_amd64.deb (or whatever architecture) contains
/usr/bin/libtool and is not normally necessary to depend on.

Signed-off-by: Simon McVittie <smcv@debian.org>

Closes: #367
Approved by: cgwalters
2016-06-26 21:31:35 +00:00
Simon McVittie f38c33fec8 entry_pathname_test_helper: these tests need extended attributes
Signed-off-by: Simon McVittie <smcv@debian.org>

Closes: #366
Approved by: cgwalters
2016-06-26 21:15:36 +00:00
Simon McVittie 3f50f36891 2016.6-1 2016-06-26 20:01:24 +01:00
Simon McVittie bd5bc56b19 d/control: ostree no longer needs its Suggests on dracut
A stronger dependency on dracut will be needed in the ostree-boot package
when the boot integration is reinstated (see #824650).
2016-06-26 19:51:04 +01:00
Simon McVittie 7c91261b3f Close #827473 in changelog 2016-06-26 19:37:55 +01:00
Simon McVittie fbc2340342 Skip more tests if /var/tmp doesn't support extended attributes 2016-06-26 14:29:31 +01:00
Simon McVittie b77f68a4c2 Build-depend on cpio, for the libarchive test 2016-06-26 14:21:34 +01:00
Simon McVittie 577e83f797 add patches to ensure that the build-time tests act on the copy of ostree that we just built 2016-06-26 13:58:19 +01:00
Simon McVittie 035bad982b update symbols file 2016-06-26 13:07:42 +01:00
Simon McVittie 61de6d0c2d d/p/pull-Correctly-handle-repo-parent_repo-when-applying-stat.patch: apply patch from upstream to fix a bug that flatpak currently works around 2016-06-26 12:32:22 +01:00
Simon McVittie 893a021a42 d/p/libostree.sym-Fix-test-symbols.patch: apply patch from upstream to fix a build-time test 2016-06-26 12:27:19 +01:00
Simon McVittie 60433eb024 New upstream release
- drop all patches, included upstream
2016-06-26 12:20:39 +01:00
Simon McVittie 43a793709c d/gbp.conf: configure to merge upstream tags into upstream/latest (add https://github.com/ostreedev/ostree as a remote) 2016-06-26 12:16:58 +01:00
Simon McVittie 20ad748b6d d/gbp.conf: configure to use upstream/latest for upstream imports 2016-06-26 12:16:05 +01:00
Simon McVittie f3738d69e9 Merge branch 'upstream/latest' into debian/master 2016-06-26 12:15:11 +01:00
Simon McVittie 591e32381a Merge tag 'v2016.6' into upstream/latest
Release 2016.6
2016-06-26 12:13:49 +01:00
Simon McVittie 051e7acbe2 Merge tag 'upstream/2016.6' into debian/master
Upstream version 2016.6
2016-06-26 12:12:28 +01:00
Simon McVittie 24762929e2 Imported Upstream version 2016.6 2016-06-26 12:12:26 +01:00
Simon McVittie dcf46b2b5e d/watch: fetch releases from GitHub instead of GNOME 2016-06-26 12:12:09 +01:00
Simon McVittie e3f9319dd0 Changelog for previous commit 2016-06-16 08:19:01 -04:00
Simon McVittie 84d8a067b0 Apply patches from upstream to make ostree buildable on Debian jessie 2016-06-15 14:20:04 -04:00
Simon McVittie d9f69cfbb3 2016.5-4 2016-06-14 15:35:49 -04:00
Simon McVittie afd211f17e Add another bug reference 2016-06-14 15:32:19 -04:00
Simon McVittie 756a435af8 Add a patch to link libreaddir-rand to libdl
This should fix test failures on Ubuntu (Closes: #826857)
2016-06-14 15:29:23 -04:00
Simon McVittie f4fd8ee1e8 Mark some patches as merged upstream 2016-06-14 15:26:49 -04:00
Simon McVittie 14ff4f94fb build: re-create tests/ostree-symlink-stamp if Makefile changes
The filename of the real ostree executable could be either .libs/ostree
or .libs/lt-ostree.

Signed-off-by: Simon McVittie <smcv@debian.org>

Closes: #337
Approved by: cgwalters
2016-06-13 00:23:04 +00:00
Simon McVittie 4801e9b30b libostreetest: include libtest.sh from srcdir, not builddir
Signed-off-by: Simon McVittie <smcv@debian.org>

Closes: #337
Approved by: cgwalters
2016-06-13 00:23:04 +00:00
Simon McVittie 8011d8c627 libtest: make gpghome in tmpdir writeable
Otherwise, during "make distcheck" it will be read-only (because it
is a copy of the read-only ${srcdir} with permissions preserved), and
deletion will fail during cleanup.

Signed-off-by: Simon McVittie <smcv@debian.org>

Closes: #337
Approved by: cgwalters
2016-06-13 00:23:04 +00:00
Simon McVittie 70a1118955 build: distribute more test files
Signed-off-by: Simon McVittie <smcv@debian.org>

Closes: #337
Approved by: cgwalters
2016-06-13 00:23:04 +00:00
Simon McVittie 906575271c build: distribute TAP helper scripts in tarballs
Signed-off-by: Simon McVittie <smcv@debian.org>

Closes: #337
Approved by: cgwalters
2016-06-13 00:23:04 +00:00
Simon McVittie c337d4dab5 build: distribute test scripts in tarballs
Signed-off-by: Simon McVittie <smcv@debian.org>

Closes: #337
Approved by: cgwalters
2016-06-13 00:23:03 +00:00
Simon McVittie 19cfe2d73a build: distribute libostree.sym in tarballs
Signed-off-by: Simon McVittie <smcv@debian.org>

Closes: #337
Approved by: cgwalters
2016-06-13 00:23:03 +00:00
Simon McVittie c930eefeea autogen.sh: rely on VPATH for submodules' Makefile-*.am.inc
This avoids hard-coding the autogen-time ${srcdir} into our build
system, and might fix "make distcheck".

We don't need to specify ${srcdir} explicitly in the various variables,
because Automake always uses make's VPATH feature to look in both
${builddir} and ${srcdir} at build time.

Signed-off-by: Simon McVittie <smcv@debian.org>

Closes: #337
Approved by: cgwalters
2016-06-13 00:23:03 +00:00
Simon McVittie b9e18b83fd Link libreaddir-rand to libdl
It uses dlsym(). There's no point in being extra-portable here
because OSTree only targets Linux anyway.

Signed-off-by: Simon McVittie <smcv@debian.org>

Closes: #336
Approved by: cgwalters
2016-06-13 00:12:55 +00:00
Simon McVittie 4b9792d860 If build-time tests fail, try 4 more times
To get an idea of whether the failure is reproducible.
2016-06-12 13:15:34 -04:00
Simon McVittie 3691da8fbf debian/test.sh: factor out our dh_auto_test wrapper
Clean up any stray processes even if the test fails.

Signed-off-by: Simon McVittie <smcv@debian.org>
2016-06-12 09:49:25 -04:00
Simon McVittie 97502c57f0 Build-depend on procps, used to check for leaked processes 2016-06-12 09:45:52 -04:00
Simon McVittie 0cf0fa8154 test-sysroot.js: set "strict mode" when sourcing libtest.sh
As with the C tests in commit 08580118, this makes sure the test
fails as soon as something goes wrong.

Signed-off-by: Simon McVittie <smcv@debian.org>

Closes: #335
Approved by: giuseppe
2016-06-12 11:26:58 +00:00
Simon McVittie b75cc5f54a Add patches to make sure the tests fail as soon as something goes wrong 2016-06-11 19:54:30 +01:00
Simon McVittie 01fe808189 Upload to unstable. 2016-06-08 21:05:03 +01:00
Simon McVittie 5e30fe4bb9 Remove ostree-grub2 and the boot-related parts of ostree
This leaves behind the library and the command-line tool, which are
also used by Flatpak. When we have documentation for how to use and test
OSTree deployments with a Debian derivative (see #824649), they should
be reinstated in an ostree-boot package (see #824650).
2016-06-08 21:04:59 +01:00
Simon McVittie ee90e82492 Rename ostree-grub2 to ostree-boot. Move all initramfs and bootloader integration there. (Closes: #824650) 2016-06-08 11:58:46 +01:00
Simon McVittie 542df553e2 test-parent: this test requires user xattrs
Signed-off-by: Simon McVittie <smcv@debian.org>

Closes: #278
Approved by: cgwalters
2016-04-25 20:46:11 +00:00
Simon McVittie 2c1dc4dac4 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 2016-04-25 12:51:45 +01:00
Simon McVittie a1bdb2d2b2 2016.5-1 2016-04-25 07:46:24 +01:00
Simon McVittie 9bb7e4f6d0 Standards-version: 3.9.8 (no changes needed) 2016-04-25 07:46:12 +01:00
Simon McVittie 8a3cd692ad Mark patch as applied upstream 2016-04-25 07:33:46 +01:00
Simon McVittie 24cab773a2 libtest: show files' contents when assertions about them fail
I've seen an intermittent test failure in an autobuilder (sbuild)
environment where logs from failed builds cannot be retrieved,
but I can no longer reproduce it. Put the contents of the offending
file in the test's failing output so that if the failure comes back,
it can be debugged.

Signed-off-by: Simon McVittie <smcv@debian.org>

Closes: #264
Approved by: cgwalters
2016-04-17 14:16:34 +00:00
Simon McVittie 099acab9d7 Add a patch to put more information in the log if tests fail, in an attempt to debug a failure in test/pull-resume.sh which I can no longer reproduce 2016-04-17 09:59:23 +01:00
Simon McVittie 6aaf72e743 Work around #821235 to avoid undefined macro 'AQ' in some man pages 2016-04-17 09:40:21 +01:00
Simon McVittie 7d3139cd7a Widen regex for killing stray gpg-agent processes 2016-04-16 23:07:31 +01:00
Simon McVittie f4ceaed578 Update symbols file for 2016.5 2016-04-16 23:04:37 +01:00
Simon McVittie 952b9bb285 Build-depend on elfutils, for test-abi.sh 2016-04-16 22:37:01 +01:00
Simon McVittie e9f6069e84 Drop patches from 2016.4, applied upstream 2016-04-16 22:30:33 +01:00
Simon McVittie 8500761c13 debian/rules: use Debian's grub2-mkconfig path 2016-04-16 22:25:30 +01:00
Simon McVittie 33bad6d00b debian/copyright: update for 2016.5 2016-04-16 22:25:02 +01:00
Simon McVittie b72c8f4b4a New(er) upstream release 2016-04-16 22:24:26 +01:00
Simon McVittie fa16aa8401 Merge tag 'upstream/2016.5' into debian/master
Upstream version 2016.5
2016-04-16 22:22:20 +01:00
Simon McVittie a7b5654e44 Imported Upstream version 2016.5 2016-04-16 22:22:18 +01:00
Simon McVittie 03171dc0d9 Add yet more patches to make the installed-tests work 2016-04-01 06:59:13 +01:00
Simon McVittie 18e9169d7a libtest.sh: only check whether $(pwd) is empty once
test-sysroot.js runs libtestExec() twice, one of which is after
creating non-hidden directories in $(pwd), so this check needs to be
skipped the second time.

Signed-off-by: Simon McVittie <smcv@debian.org>

Closes: #234
Approved by: cgwalters
2016-03-31 18:54:13 +00:00
Simon McVittie 9c4babf316 test-xattrs: sync how this is skipped with test-rofiles-fuse
If we touch test-xattrs before sourcing libtest.sh, we get:

test tmpdir=/tmp/test-tmp-ostree_test-xattrs.sh.test-HSEXEY is not
empty; run this test via `make check TESTS=`, not directly

Signed-off-by: Simon McVittie <smcv@debian.org>

Closes: #234
Approved by: cgwalters
2016-03-31 18:54:13 +00:00
Simon McVittie 839628b3fa test-abi: use G_TEST_SRCDIR, G_TEST_BUILDDIR
There's no need to invent new variables for these.

Signed-off-by: Simon McVittie <smcv@debian.org>

Closes: #234
Approved by: cgwalters
2016-03-31 18:54:13 +00:00
Simon McVittie efb86ba9d3 libtest.sh: use G_TEST_SRCDIR, G_TEST_BUILDDIR to find resources
This fixes the bug that in installed-tests that run testlib.sh under
"bash -c" (i.e. the C and JS tests), $(dirname $0) is "." and we can't do
the LD_PRELOAD correctly:

ERROR: ld.so: object './libreaddir-rand.so' from LD_PRELOAD cannot be
preloaded (cannot open shared object file): ignored.

Similarly, those tests can't copy gpghome correctly.

This also removes the confusing situation that SRCDIR in libtest.sh
(which is ${top_srcdir}/tests) does not mean the same thing as SRCDIR
in test-abi.sh (which is just ${top_srcdir}).

Signed-off-by: Simon McVittie <smcv@debian.org>

Closes: #234
Approved by: cgwalters
2016-03-31 18:54:13 +00:00
Simon McVittie 4c3a6272a5 debian/gbp.conf: disable numbered patches 2016-03-31 16:12:26 +01:00
Simon McVittie 3c5fbc0662 Add a patch to skip a test with non-GNU parallel more reliably 2016-03-31 16:10:15 +01:00
Simon McVittie f428f329b2 Update patches, upstreamed 2016-03-31 16:09:35 +01:00
Simon McVittie 9dafc82024 Probe for GNU parallel more accurately
moreutils parallel isn't compatible with the command-line syntax
used here. Because it doesn't implement GNU-style --help and exits 1
when that option is given, this test was correctly skipped when
using moreutils parallel, but only by mistake.

moreutils parallel might conceivably gain --help and --version in
future, but hopefully nothing incompatible with GNU parallel is going
to gain a --gnu option.

Also use the --gnu option to force the new command-line semantics;
some versions optionally supported an incompatible command-line syntax
taken from moreutils parallel.

Signed-off-by: Simon McVittie <smcv@debian.org>

Closes: #232
Approved by: cgwalters
2016-03-31 14:22:06 +00:00
Simon McVittie e1ce859368 Skip tests that run rofiles-fuse if /dev/fuse or /etc/mtab unavailable
Signed-off-by: Simon McVittie <smcv@debian.org>

Closes: #232
Approved by: cgwalters
2016-03-31 14:22:06 +00:00
Simon McVittie d458399615 Force libreaddir-rand to be a shared library
If installed-tests are disabled, it would normally be a static
(convenience) library, which isn't something we can LD_PRELOAD.

Signed-off-by: Simon McVittie <smcv@debian.org>

Closes: #232
Approved by: cgwalters
2016-03-31 14:22:06 +00:00
Simon McVittie 1dd85513e5 tests/admin-test.sh: this is a bash script, not a POSIX sh script
The "function foo()" syntax is bash-specific, and Colin indicated in
PR #226 that he prefers to require bash rather than trying to support
every POSIX shell.

Signed-off-by: Simon McVittie <smcv@debian.org>

Closes: #232
Approved by: cgwalters
2016-03-31 14:22:06 +00:00
Simon McVittie 07aa8e1c76 Load g-i bindings from builddir during build-time testing
Previously, the build-time tests would only pass if the g-i bindings to
OSTree were already installed, with a reasonably similar version.

Signed-off-by: Simon McVittie <smcv@debian.org>

Closes: #232
Approved by: cgwalters
2016-03-31 14:22:06 +00:00
Simon McVittie 2b9032f016 .gitignore: update
Closes: #232
Approved by: cgwalters
2016-03-31 14:22:06 +00:00
Simon McVittie b25ddd29ab In tests that use gpg, terminate the gpg-agent after testing
Otherwise we leak those processes.

Signed-off-by: Simon McVittie <smcv@debian.org>

Closes: #232
Approved by: cgwalters
2016-03-31 14:22:06 +00:00
Simon McVittie 47fd5c74f1 tap-test: clean up temporary test directories as intended
The script created ./.testtmp but looked for ./.test, which isn't
going to work.

This means the various "ostree trivial-httpd --autoexit" processes
actually exit, because their web roots are cleaned up now.

Signed-off-by: Simon McVittie <smcv@debian.org>

Closes: #232
Approved by: cgwalters
2016-03-31 14:22:06 +00:00
Simon McVittie f8bef792cb Symlink libreaddir-rand.so into tests directory
This means it can be LD_PRELOADed during build-time testing.

Signed-off-by: Simon McVittie <smcv@debian.org>

Closes: #232
Approved by: cgwalters
2016-03-31 14:22:06 +00:00
Simon McVittie 3e3755c497 various tests: skip if temp directory lacks xattr support
Some autobuilder environments place the entire build chroot on tmpfs, so
even /var/tmp might not have this.

Signed-off-by: Simon McVittie <smcv@debian.org>

Closes: #232
Approved by: cgwalters
2016-03-31 14:22:06 +00:00
Simon McVittie c276025466 test-xattrs: use TAP syntax to skip test
Signed-off-by: Simon McVittie <smcv@debian.org>

Closes: #232
Approved by: cgwalters
2016-03-31 14:22:06 +00:00
Simon McVittie 75bca9173e Skip tests involving rofiles-fuse if unavailable 2016-03-31 13:44:58 +01:00
Simon McVittie 8d30b20a8b Run dh_auto_test with VERBOSE=1, to get logs with older debhelper 2016-03-31 13:22:53 +01:00
Simon McVittie d064f20bfc Fix no-xattrs patch so it does the check after sourcing libtest.sh
Otherwise the creation of `test-xattrs` breaks the check for an empty
directory in libtest.sh, breaking installed-tests.

Signed-off-by: Simon McVittie <smcv@debian.org>
2016-03-31 11:08:20 +01:00
Simon McVittie e059debbb6 Mark patches as forwarded 2016-03-31 10:40:12 +01:00
Simon McVittie f7ca51a754 Add patch to mark admin-test as a bash script, not a POSIX sh script 2016-03-31 09:49:33 +01:00
Simon McVittie 85d1af2a65 debian/ostree-tests.lintian-overrides: override a couple of false positives 2016-03-31 09:41:00 +01:00