From e2bbb5664c96d73f85fce6dbd44cd35aea5c1904 Mon Sep 17 00:00:00 2001 From: Eric Haszlakiewicz Date: Sat, 22 Mar 2014 21:15:41 -0400 Subject: [PATCH] Rename the "test_case" test to "test_charcase" to make it slightly less confusing. --- .gitignore | 1 + tests/Makefile.am | 29 ++----------------- tests/{test_case.c => test_charcase.c} | 0 ...t_case.expected => test_charcase.expected} | 0 tests/{test_case.test => test_charcase.test} | 2 +- 5 files changed, 5 insertions(+), 27 deletions(-) rename tests/{test_case.c => test_charcase.c} (100%) rename tests/{test_case.expected => test_charcase.expected} (100%) rename tests/{test_case.test => test_charcase.test} (86%) diff --git a/.gitignore b/.gitignore index d3e748ef23..15000ba02b 100644 --- a/.gitignore +++ b/.gitignore @@ -39,6 +39,7 @@ /tests/test_parse_int64 /tests/test_parse /tests/test_cast +/tests/test_charcase /tests/test_locale /tests/test_null /tests/test_printbuf diff --git a/tests/Makefile.am b/tests/Makefile.am index 4fb3cb8a86..70f1fc144f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,5 +1,6 @@ include ../Makefile.am.inc +LDADD= $(LIBJSON_LA) LIBJSON_LA=$(top_builddir)/libjson-c.la @@ -12,45 +13,21 @@ check_PROGRAMS += test_null check_PROGRAMS += test_cast check_PROGRAMS += test_parse check_PROGRAMS += test_locale -check_PROGRAMS += test_case +check_PROGRAMS += test_charcase -test1_LDADD = $(LIBJSON_LA) - -test1Formatted_LDADD= $(LIBJSON_LA) test1Formatted_SOURCES = test1.c parse_flags.c test1Formatted_CPPFLAGS = -DTEST_FORMATTED -test2_LDADD = $(LIBJSON_LA) - -test2Formatted_LDADD= $(LIBJSON_LA) test2Formatted_SOURCES = test2.c parse_flags.c test2Formatted_CPPFLAGS = -DTEST_FORMATTED -test4_LDADD = $(LIBJSON_LA) - -testReplaceExisting_LDADD = $(LIBJSON_LA) - -test_parse_int64_LDADD = $(LIBJSON_LA) - -test_null_LDADD = $(LIBJSON_LA) - -test_cast_LDADD = $(LIBJSON_LA) - -test_parse_LDADD = $(LIBJSON_LA) - -test_locale_LDADD = $(LIBJSON_LA) - -test_case_LDADD = $(LIBJSON_LA) - -TESTS = test1.test test2.test test4.test testReplaceExisting.test parse_int64.test test_null.test test_cast.test test_parse.test test_locale.test test_case.test +TESTS = test1.test test2.test test4.test testReplaceExisting.test parse_int64.test test_null.test test_cast.test test_parse.test test_locale.test test_charcase.test TESTS+= test_printbuf.test check_PROGRAMS+=test_printbuf -test_printbuf_LDADD = $(LIBJSON_LA) TESTS+= test_set_serializer.test check_PROGRAMS += test_set_serializer -test_set_serializer_LDADD = $(LIBJSON_LA) EXTRA_DIST= EXTRA_DIST += $(TESTS) diff --git a/tests/test_case.c b/tests/test_charcase.c similarity index 100% rename from tests/test_case.c rename to tests/test_charcase.c diff --git a/tests/test_case.expected b/tests/test_charcase.expected similarity index 100% rename from tests/test_case.expected rename to tests/test_charcase.expected diff --git a/tests/test_case.test b/tests/test_charcase.test similarity index 86% rename from tests/test_case.test rename to tests/test_charcase.test index ad0a0998a3..c967475ce4 100755 --- a/tests/test_case.test +++ b/tests/test_charcase.test @@ -8,5 +8,5 @@ if test -z "$srcdir"; then fi . "$srcdir/test-defs.sh" -run_output_test test_case +run_output_test test_charcase exit $?