mirror of
https://github.com/DaveGamble/cJSON.git
synced 2024-12-26 21:04:24 +08:00
Revert "feat: add tests for #842" to fix test failures
This reverts commit 5b502cdbfb21fbe5f6cf9ffbd2b96e4281a741e6. Related to #860
This commit is contained in:
parent
324973008c
commit
424ce4ce96
@ -62,7 +62,6 @@ if(ENABLE_CJSON_TEST)
|
|||||||
|
|
||||||
option(ENABLE_VALGRIND OFF "Enable the valgrind memory checker for the tests.")
|
option(ENABLE_VALGRIND OFF "Enable the valgrind memory checker for the tests.")
|
||||||
if (ENABLE_VALGRIND)
|
if (ENABLE_VALGRIND)
|
||||||
add_compile_definitions(ENABLE_VALGRIND)
|
|
||||||
find_program(MEMORYCHECK_COMMAND valgrind)
|
find_program(MEMORYCHECK_COMMAND valgrind)
|
||||||
if ("${MEMORYCHECK_COMMAND}" MATCHES "MEMORYCHECK_COMMAND-NOTFOUND")
|
if ("${MEMORYCHECK_COMMAND}" MATCHES "MEMORYCHECK_COMMAND-NOTFOUND")
|
||||||
message(WARNING "Valgrind couldn't be found.")
|
message(WARNING "Valgrind couldn't be found.")
|
||||||
|
@ -732,23 +732,6 @@ static void cjson_set_bool_value_must_not_break_objects(void)
|
|||||||
cJSON_Delete(sobj);
|
cJSON_Delete(sobj);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void deallocated_pointers_should_be_set_to_null(void)
|
|
||||||
{
|
|
||||||
/* deallocated pointers should be set to null */
|
|
||||||
/* however, valgrind on linux reports when attempting to access a freed memory, we have to skip it */
|
|
||||||
#ifndef ENABLE_VALGRIND
|
|
||||||
cJSON *string = cJSON_CreateString("item");
|
|
||||||
cJSON *root = cJSON_CreateObject();
|
|
||||||
|
|
||||||
cJSON_Delete(string);
|
|
||||||
free(string->valuestring);
|
|
||||||
|
|
||||||
cJSON_AddObjectToObject(root, "object");
|
|
||||||
cJSON_Delete(root->child);
|
|
||||||
free(root->child->string);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
int CJSON_CDECL main(void)
|
int CJSON_CDECL main(void)
|
||||||
{
|
{
|
||||||
UNITY_BEGIN();
|
UNITY_BEGIN();
|
||||||
@ -779,7 +762,6 @@ int CJSON_CDECL main(void)
|
|||||||
RUN_TEST(cjson_delete_item_from_array_should_not_broken_list_structure);
|
RUN_TEST(cjson_delete_item_from_array_should_not_broken_list_structure);
|
||||||
RUN_TEST(cjson_set_valuestring_to_object_should_not_leak_memory);
|
RUN_TEST(cjson_set_valuestring_to_object_should_not_leak_memory);
|
||||||
RUN_TEST(cjson_set_bool_value_must_not_break_objects);
|
RUN_TEST(cjson_set_bool_value_must_not_break_objects);
|
||||||
RUN_TEST(deallocated_pointers_should_be_set_to_null);
|
|
||||||
|
|
||||||
return UNITY_END();
|
return UNITY_END();
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user