diff options
author | Riccardo Spagni <ric@spagni.net> | 2018-10-15 13:37:18 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2018-10-15 13:37:18 +0200 |
commit | 5ccd3d32b41c5ae2f1fcd9d3a2526a233c8f70f0 (patch) | |
tree | c4901428d67d7895662cfbbc370d56673d62eadd /tests/crypto | |
parent | Merge pull request #4481 (diff) | |
parent | epee: initialize a few data members where it seems to be appropriate (diff) | |
download | monero-5ccd3d32b41c5ae2f1fcd9d3a2526a233c8f70f0.tar.xz |
Merge pull request #4489
00901e9c epee: initialize a few data members where it seems to be appropriate (moneromooo-monero)
144a6c32 abstract_tcp_server2: move m_period to subclass (moneromooo-monero)
758d7684 connection_basic: remove unused floating time start time (moneromooo-monero)
e5108a29 Catch more exceptions in dtors (moneromooo-monero)
Diffstat (limited to 'tests/crypto')
-rw-r--r-- | tests/crypto/main.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/crypto/main.cpp b/tests/crypto/main.cpp index e5406f771..cc3b53b83 100644 --- a/tests/crypto/main.cpp +++ b/tests/crypto/main.cpp @@ -35,6 +35,7 @@ #include <vector> #include "warnings.h" +#include "misc_log_ex.h" #include "crypto/crypto.h" #include "crypto/hash.h" #include "crypto-tests.h" @@ -59,6 +60,7 @@ bool operator !=(const key_derivation &a, const key_derivation &b) { DISABLE_GCC_WARNING(maybe-uninitialized) int main(int argc, char *argv[]) { + TRY_ENTRY(); fstream input; string cmd; size_t test = 0; @@ -266,4 +268,5 @@ error: error = true; } return error ? 1 : 0; + CATCH_ENTRY_L0("main", 1); } |