diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2017-08-17 14:04:22 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2017-08-17 14:04:22 +0200 |
| commit | d78c0b164b3ae8278d51d453a16a69aefe4fec2a (patch) | |
| tree | 7405acf73e46b0e6526d33cf2def1810e748e7a7 /test | |
| parent | f8ca17278f8d1114e37e656025bbf0bac2d59cc7 (diff) | |
unit tests: Really bail out on error; and no need for a tempfile.
Change-Id: I53c1ab62bf9293217a5cada54c358292364ed60a
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.am | 2 | ||||
| -rw-r--r-- | test/test.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 5f7b769d0..005618de9 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -98,4 +98,4 @@ all-local: unittest @echo "Running build-time unit tests. For more thorough testing, please run 'make check'." @echo @fc-cache "@LO_PATH@"/share/fonts/truetype - @${top_builddir}/test/unittest 2> unittest.log || { cat unittest.log ; exit 1 ; } + @${top_builddir}/test/unittest diff --git a/test/test.cpp b/test/test.cpp index ed2f15af0..e989e3fa7 100644 --- a/test/test.cpp +++ b/test/test.cpp @@ -65,7 +65,7 @@ int main(int argc, char** argv) Log::initialize("tst", loglevel, true, false, {}); - runClientTests(true, verbose); + return runClientTests(true, verbose)? 0: 1; } static bool IsStandalone = false; @@ -134,7 +134,7 @@ bool runClientTests(bool standalone, bool verbose) outputter.setNoWrap(); outputter.write(); - return result.wasSuccessful() ? 0 : 1; + return result.wasSuccessful(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |