diff options
| author | Garrett D'Amore <garrett@damore.org> | 2021-01-03 10:35:06 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-03 10:35:06 -0800 |
| commit | 9c6ac231b8b7d0c597a4010135edb14b8513e3f6 (patch) | |
| tree | adfad0200b03da6cb176f5f3c6045407c8f96b29 /tests | |
| parent | d5814d58496ff1fbbb2e6727ff8bffe78204223c (diff) | |
| download | nng-9c6ac231b8b7d0c597a4010135edb14b8513e3f6.tar.gz nng-9c6ac231b8b7d0c597a4010135edb14b8513e3f6.tar.bz2 nng-9c6ac231b8b7d0c597a4010135edb14b8513e3f6.zip | |
fixes #1398 integrate new acutest.h (#1400)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/compat_testutil.h | 4 | ||||
| -rw-r--r-- | tests/nuts_compat.c (renamed from tests/compat_testutil.c) | 0 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 5fcd4323..9ff9adfa 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -64,7 +64,7 @@ if (NNG_TESTS) # are present. It's not worth trying to figure out which of these # should work and which shouldn't. macro(add_nng_compat_test NAME TIMEOUT) - add_executable(${NAME} ${NAME}.c compat_testutil.c) + add_executable(${NAME} ${NAME}.c nuts_compat.c) target_link_libraries(${NAME} nng_testing) target_include_directories(${NAME} PRIVATE ${PROJECT_SOURCE_DIR}/src/compat diff --git a/tests/compat_testutil.h b/tests/compat_testutil.h index b7c2ecaa..cac8d5a2 100644 --- a/tests/compat_testutil.h +++ b/tests/compat_testutil.h @@ -2,8 +2,8 @@ Copyright (c) 2013 Insollo Entertainment, LLC. All rights reserved. Copyright 2017 Garrett D'Amore <garrett@damore.org> Copyright 2016 Franklin "Snaipe" Mathieu <franklinmathieu@gmail.com> - Copyright 2018 Staysail Systems, Inc. <info@staysail.tech> Copyright 2018 Capitar IT Group BV <info@capitar.com> + Copyright 2021 Staysail Systems, Inc. <info@staysail.tech> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), @@ -41,7 +41,7 @@ #define nn_assert assert #define errno_assert assert #define wsa_assert assert -#define alloc_assert(x) assert(x != NULL) +#define alloc_assert(x) assert((x) != NULL) #if defined __GNUC__ || defined __llvm__ || defined __clang__ #define NN_UNUSED __attribute__((unused)) diff --git a/tests/compat_testutil.c b/tests/nuts_compat.c index 7db03bf0..7db03bf0 100644 --- a/tests/compat_testutil.c +++ b/tests/nuts_compat.c |