aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-01-04 10:12:14 +0100
committerIgor Gnatenko <i.gnatenko.brain@gmail.com>2019-01-04 11:47:59 +0100
commit26437f0297bd9dcf4411d4591679724d59e1c312 (patch)
tree152e04fe056ee9e760f421aa95262527d8c0137a
parent3a6e2aeed9737f1082571e868ba50e72957f27c7 (diff)
downloadmeson-26437f0297bd9dcf4411d4591679724d59e1c312.zip
meson-26437f0297bd9dcf4411d4591679724d59e1c312.tar.gz
meson-26437f0297bd9dcf4411d4591679724d59e1c312.tar.bz2
rpm: remove manual printing of error logs on failure
This effectively reverts 92219a2739ea69fa617cca74517b68ed5e1bcb7d. Back in the day, meson test would not print the logs on failure. But it now does that automatically, for the failed test. Printing all logs is annoying because it results in exteremely long output in some packages. Example output: + /usr/bin/ninja test -v -j4 -C x86_64-redhat-linux-gnu ninja: Entering directory `x86_64-redhat-linux-gnu' [0/1] /usr/bin/meson test --no-rebuild --print-errorlogs 1/16 test-script.sh OK 46.23 s ... 14/16 test-casync FAIL 1.17 s (exit status 1) 15/16 test-cautil OK 0.00 s 16/16 test-util OK 0.01 s Ok: 15 Expected Fail: 0 Fail: 1 Unexpected Pass: 0 Skipped: 0 Timeout: 0 The output from the failed tests: 14/16 test-casync FAIL 1.17 s (exit status 1) --- command --- /home/zbyszek/fedora/casync/casync-2/x86_64-redhat-linux-gnu/test-casync --- stdout --- error -------
-rw-r--r--data/macros.meson7
1 files changed, 1 insertions, 6 deletions
diff --git a/data/macros.meson b/data/macros.meson
index 4a8a3ca..05d21e5 100644
--- a/data/macros.meson
+++ b/data/macros.meson
@@ -31,9 +31,4 @@
%ninja_install -C %{_vpath_builddir}
%meson_test \
- %ninja_test -C %{_vpath_builddir} || \
- ( rc=$?; \
- echo "-----BEGIN TESTLOG-----"; \
- cat %{_vpath_builddir}/meson-logs/testlog.txt; \
- echo "-----END TESTLOG-----"; \
- exit $rc; )
+ %ninja_test -C %{_vpath_builddir}