summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorEric Haszlakiewicz <erh+git@nimenees.com>2023-03-28 23:08:39 +0000
committerEric Haszlakiewicz <erh+git@nimenees.com>2023-03-28 23:08:39 +0000
commitd0f32a5a43d1b9dc0b2cd6af310e5f09b97c3423 (patch)
tree49d7c4be66b0ecdc2367d499fba3f3c1dd05d5dd /tests
parentefd536af481a79c21cc3d15c7bc69bbaec154faf (diff)
downloadjson-c-master.tar.gz
Stop linking a copy of _json_c_strerror() (strerror_override.c) into the tests.HEADmaster
That hasn't been needed since since commit 6068d3f, which changed that code to check an env var instead ("_JSON_C_STRERROR_ENABLE"). Fixes issue #812, about dup symbols in static builds with clang.
Diffstat (limited to 'tests')
-rw-r--r--tests/CMakeLists.txt4
-rw-r--r--tests/test_strerror.c1
-rw-r--r--tests/test_util_file.c1
3 files changed, 0 insertions, 6 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index beef00a..bdee375 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -44,10 +44,6 @@ endif()
foreach(TESTNAME ${ALL_TEST_NAMES})
add_executable(${TESTNAME} ${TESTNAME}.c)
-if(${TESTNAME} STREQUAL test_strerror OR ${TESTNAME} STREQUAL test_util_file)
-# For output consistency, we need _json_c_strerror() in some tests:
-target_sources(${TESTNAME} PRIVATE ../strerror_override.c)
-endif()
add_test(NAME ${TESTNAME} COMMAND ${PROJECT_SOURCE_DIR}/tests/${TESTNAME}.test)
# XXX using the non-target_ versions of these doesn't work :(
diff --git a/tests/test_strerror.c b/tests/test_strerror.c
index 57b051f..773b1aa 100644
--- a/tests/test_strerror.c
+++ b/tests/test_strerror.c
@@ -2,7 +2,6 @@
#undef NDEBUG
#endif
#include "strerror_override.h"
-#include "strerror_override_private.h"
#include <stdio.h>
diff --git a/tests/test_util_file.c b/tests/test_util_file.c
index 27a097e..036dcbc 100644
--- a/tests/test_util_file.c
+++ b/tests/test_util_file.c
@@ -2,7 +2,6 @@
#undef NDEBUG
#endif
#include "strerror_override.h"
-#include "strerror_override_private.h"
#ifdef WIN32
#define WIN32_LEAN_AND_MEAN
#include <io.h>