d0s3t3ch/wownero
1
0
Fork 0
mirror of https://git.wownero.com/wownero/wownero.git synced 2024-08-15 01:03:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5251

Browse source 
7632dede crypto: fix PaX issue on NetBSD with CNv4 JIT (moneromooo-monero)
89b1630e gtest: build fix for NetBSD (moneromooo-monero)
fa43b547 tests: handle any cmake detected python interpreter (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2019-03-21 14:47:43 +02:00
commit 39107e18d5
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
7 changed files with 41 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/block_weight/CMakeLists.txt
View file

@ -42,4 +42,4 @@ target_link_libraries(block_weight
add_test(
NAME block_weight
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/compare.py ${CMAKE_CURRENT_SOURCE_DIR}/block_weight.py ${CMAKE_CURRENT_BINARY_DIR}/block_weight)
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/compare.py ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/block_weight.py ${CMAKE_CURRENT_BINARY_DIR}/block_weight)

2
tests/block_weight/block_weight.py
View file

@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/env python
# Simulate a maximal block attack on the Monero network
# This uses the scheme proposed by ArticMine
# Written by Sarang Nother

15
tests/block_weight/compare.py
View file

@ -3,10 +3,17 @@
import sys
import subprocess
print 'running: ', sys.argv[1]
S0 = subprocess.check_output(sys.argv[1], stderr=subprocess.STDOUT)
print 'running: ', sys.argv[2]
S1 = subprocess.check_output(sys.argv[2], stderr=subprocess.STDOUT)
if len(sys.argv) == 4:
first = [sys.argv[1], sys.argv[2]]
second = [sys.argv[3]]
else:
first = [sys.argv[1]]
second = [sys.argv[2]]
print 'running: ', first
S0 = subprocess.check_output(first, stderr=subprocess.STDOUT)
print 'running: ', second
S1 = subprocess.check_output(second, stderr=subprocess.STDOUT)
print 'comparing'
if S0 != S1:
sys.exit(1)

2
tests/gtest/include/gtest/internal/gtest-port-arch.h
View file

@ -88,6 +88,8 @@
# define GTEST_OS_OPENBSD 1
#elif defined __QNX__
# define GTEST_OS_QNX 1
#elif defined(__NetBSD__)
# define GTEST_OS_NETBSD 1
#endif // __CYGWIN__
#endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_ARCH_H_

3
tests/gtest/include/gtest/internal/gtest-port.h
View file

@ -790,7 +790,8 @@ using ::std::tuple_size;
(GTEST_OS_MAC && !GTEST_OS_IOS) || \
(GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \
GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX || GTEST_OS_HPUX || \
GTEST_OS_OPENBSD || GTEST_OS_QNX || GTEST_OS_FREEBSD)
GTEST_OS_OPENBSD || GTEST_OS_QNX || GTEST_OS_FREEBSD || \
GTEST_OS_NETBSD)
# define GTEST_HAS_DEATH_TEST 1
#endif