diff options
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/daemon/main.cpp | 2 | ||||
| -rwxr-xr-x | tests/functional_tests/mining.py | 23 | ||||
| -rw-r--r-- | tests/fuzz/signature.cpp | 2 |
4 files changed, 18 insertions, 15 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2a16e0081..316fd7ed8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -395,7 +395,7 @@ elseif(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND NOT MINGW) set(DEFAULT_STACK_TRACE ON) set(STACK_TRACE_LIB "easylogging++") # for diag output only set(LIBUNWIND_LIBRARIES "") -elseif (ARM AND STATIC) +elseif (ARM) set(DEFAULT_STACK_TRACE OFF) set(LIBUNWIND_LIBRARIES "") else() @@ -969,6 +969,7 @@ find_path(ZMQ_INCLUDE_PATH zmq.h) find_library(ZMQ_LIB zmq) find_library(PGM_LIBRARY pgm) find_library(NORM_LIBRARY norm) +find_library(GSSAPI_LIBRARY gssapi_krb5) find_library(PROTOLIB_LIBRARY protolib) find_library(SODIUM_LIBRARY sodium) @@ -984,6 +985,9 @@ endif() if(NORM_LIBRARY) set(ZMQ_LIB "${ZMQ_LIB};${NORM_LIBRARY}") endif() +if(GSSAPI_LIBRARY) + set(ZMQ_LIB "${ZMQ_LIB};${GSSAPI_LIBRARY}") +endif() if(PROTOLIB_LIBRARY) set(ZMQ_LIB "${ZMQ_LIB};${PROTOLIB_LIBRARY}") endif() diff --git a/src/daemon/main.cpp b/src/daemon/main.cpp index f2ae6dcc3..3db8fbcb4 100644 --- a/src/daemon/main.cpp +++ b/src/daemon/main.cpp @@ -249,7 +249,7 @@ int main(int argc, char const * argv[]) command_line::get_arg(vm, cryptonote::arg_data_dir)); #ifdef WIN32 - if (isFat32(data_dir.root_name().c_str())) + if (isFat32(data_dir.root_path().c_str())) { MERROR("Data directory resides on FAT32 volume that has 4GiB file size limit, blockchain might get corrupted."); } diff --git a/tests/functional_tests/mining.py b/tests/functional_tests/mining.py index c60bf8396..34b4aceab 100755 --- a/tests/functional_tests/mining.py +++ b/tests/functional_tests/mining.py @@ -95,20 +95,19 @@ class MiningTest(): assert res_status.block_reward >= 600000000000 # wait till we mined a few of them + target_height = prev_height + 5 + height = prev_height timeout = 60 # randomx is slow to init - timeout_height = prev_height - while True: - time.sleep(1) - res_info = daemon.get_info() - height = res_info.height - if height >= prev_height + 5: - break - if height > timeout_height: - timeout = 5 - timeout_height = height + while height < target_height: + seen_height = height + for _ in range(timeout): + time.sleep(1) + height = daemon.get_info().height + if height > seen_height: + break else: - timeout -= 1 - assert timeout >= 0 + assert False, 'Failed to mine successor to block %d (initial block = %d)' % (seen_height, prev_height) + timeout = 5 if via_daemon: res = daemon.stop_mining() diff --git a/tests/fuzz/signature.cpp b/tests/fuzz/signature.cpp index c587ff6cd..443057a57 100644 --- a/tests/fuzz/signature.cpp +++ b/tests/fuzz/signature.cpp @@ -59,6 +59,6 @@ BEGIN_INIT_SIMPLE_FUZZER() END_INIT_SIMPLE_FUZZER() BEGIN_SIMPLE_FUZZER() - tools::wallet2::message_signature_result_t result = wallet->verify("test", address, s); + tools::wallet2::message_signature_result_t result = wallet->verify("test", address, std::string((const char*)buf, len)); std::cout << "Signature " << (result.valid ? "valid" : "invalid") << std::endl; END_SIMPLE_FUZZER() |