diff options
author | Colin Walters <walters@verbum.org> | 2017-09-26 14:05:08 -0400 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2017-09-27 18:08:06 +0000 |
commit | b71a913e210e5ca853030b6c466fd52054e1217e (patch) | |
tree | 1ac7aa3b8cb5ab2ca0836b63886e51a844f1a4bb /ci | |
parent | 9d8c1ec7dff18941b1cf2fac7328bffb25c63c1e (diff) | |
download | ostree-b71a913e210e5ca853030b6c466fd52054e1217e.tar.gz |
ci: Record primary context results using g-d-t-r --log-directory
So the output isn't all intermingled. I just pushed a commit
to add `--log-directory`, so we need to build it from git master
for now.
Closes: #1218
Approved by: jlebon
Diffstat (limited to 'ci')
-rwxr-xr-x | ci/build-check.sh | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/ci/build-check.sh b/ci/build-check.sh index 7df1f424..cb9dbb83 100755 --- a/ci/build-check.sh +++ b/ci/build-check.sh @@ -6,12 +6,26 @@ set -xeuo pipefail dn=$(dirname $0) . ${dn}/libbuild.sh ${dn}/build.sh +topdir=$(git rev-parse --show-toplevel) +resultsdir=$(mktemp -d) make check make syntax-check # TODO: do syntax-check under check +# See comment below +for x in test-suite.log config.log; do + mv ${x} ${resultsdir} +done # And now run the installed tests make install if test -x /usr/bin/gnome-desktop-testing-runner; then - gnome-desktop-testing-runner -p 0 ${INSTALLED_TESTS_PATTERN:-libostree/} + mkdir ${resultsdir}/gdtr-results + # Temporary hack + (git clone --depth=1 https://git.gnome.org/browse/gnome-desktop-testing + cd gnome-desktop-testing + env NOCONFIGURE=1 ./autogen.sh + ./configure --prefix=/usr --libdir=/usr/lib64 + make && rm -f /usr/bin/ginsttest-runner && make install) + # Use the new -L option + gnome-desktop-testing-runner -L ${resultsdir}/gdtr-results -p 0 ${INSTALLED_TESTS_PATTERN:-libostree/} fi if test -x /usr/bin/clang; then @@ -25,3 +39,11 @@ if test -x /usr/bin/clang; then export CC=clang build fi + +# Keep this in sync with papr.yml +# TODO; Split the main/clang builds into separate build dirs +for x in test-suite.log config.log gdtr-results; do + if test -e ${resultsdir}/${x}; then + mv ${resultsdir}/${x} ${topdir} + fi +done |