summaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorDan Nicholson <dbn@endlessos.org>2021-06-21 13:42:20 -0600
committerDan Nicholson <dbn@endlessos.org>2021-06-21 13:47:00 -0600
commit156ec07f01f04b878a278a8bc8259ac0b303979f (patch)
tree391aaf1eedaa6a805d5c886f763954ca1f0dba2b /ci
parentf1b900340f04e1555ed9fd5ef7776bffbbff14a7 (diff)
downloadostree-156ec07f01f04b878a278a8bc8259ac0b303979f.tar.gz
ci: Drop special handling of test-suite.log
The automake test harness[1] already dumps the contents of `test-suite.log` when `VERBOSE=1` is set, so we don't need to add special handling for it. 1. https://www.gnu.org/software/automake/manual/html_node/Parallel-Test-Harness.html
Diffstat (limited to 'ci')
-rwxr-xr-xci/gh-build.sh19
1 files changed, 5 insertions, 14 deletions
diff --git a/ci/gh-build.sh b/ci/gh-build.sh
index 949ce5fa..11434327 100755
--- a/ci/gh-build.sh
+++ b/ci/gh-build.sh
@@ -32,6 +32,8 @@ srcdir="$(pwd)"
mkdir ci-build
cd ci-build
+# V=1 shows the full build commands. VERBOSE=1 dumps test-suite.log on
+# failures.
make="make V=1 VERBOSE=1"
../configure \
@@ -40,20 +42,9 @@ make="make V=1 VERBOSE=1"
${make}
-# Run the tests both using check and distcheck and dump the logs on
-# failures. For distcheck the logs will be inside the dist directory, so
-# tell make to use the current directory.
-if ! ${make} check; then
- cat test-suite.log || :
- exit 1
-fi
-if ! ${make} distcheck \
- TEST_SUITE_LOG=$(pwd)/test-suite.log \
- DISTCHECK_CONFIGURE_FLAGS="$*"
-then
- cat test-suite.log || :
- exit 1
-fi
+# Run the tests both using check and distcheck.
+${make} check
+${make} distcheck DISTCHECK_CONFIGURE_FLAGS="$*"
# Show the installed files
${make} install DESTDIR=$(pwd)/DESTDIR