Browse Source

Stop linking a copy of _json_c_strerror() (strerror_override.c) into the tests.

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.
tags/json-c-0.17-20230812
Eric Haszlakiewicz 2 years ago
parent
commit
d0f32a5a43
6 changed files with 2 additions and 21 deletions
  1. +0
    -1
      CMakeLists.txt
  2. +2
    -0
      json-c.sym
  3. +0
    -14
      strerror_override_private.h
  4. +0
    -4
      tests/CMakeLists.txt
  5. +0
    -1
      tests/test_strerror.c
  6. +0
    -1
      tests/test_util_file.c

+ 0
- 1
CMakeLists.txt View File

@@ -398,7 +398,6 @@ set(JSON_C_HEADERS
${PROJECT_SOURCE_DIR}/json_object_private.h
${PROJECT_SOURCE_DIR}/random_seed.h
${PROJECT_SOURCE_DIR}/strerror_override.h
${PROJECT_SOURCE_DIR}/strerror_override_private.h
${PROJECT_SOURCE_DIR}/math_compat.h
${PROJECT_SOURCE_DIR}/snprintf_compat.h
${PROJECT_SOURCE_DIR}/strdup_compat.h


+ 2
- 0
json-c.sym View File

@@ -41,6 +41,8 @@ JSONC_PRIVATE {
printbuf_new;
printbuf_reset;
sprintbuf;
# Used by tests:
_json_c_strerror;
};

JSONC_0.14 {


+ 0
- 14
strerror_override_private.h View File

@@ -1,14 +0,0 @@
#ifndef __json_strerror_override_private_h__
#define __json_strerror_override_private_h__

/**
* @file
* @brief Do not use, json-c internal, may be changed or removed at any time.
*/

#include "json_types.h"

/* Used by tests to get consistent output */
JSON_EXPORT int _json_c_strerror_enable;

#endif

+ 0
- 4
tests/CMakeLists.txt View File

@@ -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 :(


+ 0
- 1
tests/test_strerror.c View File

@@ -2,7 +2,6 @@
#undef NDEBUG
#endif
#include "strerror_override.h"
#include "strerror_override_private.h"

#include <stdio.h>



+ 0
- 1
tests/test_util_file.c View File

@@ -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>


Loading…
Cancel
Save