summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Haszlakiewicz <erh+git@nimenees.com>2014-03-22 21:15:41 -0400
committerEric Haszlakiewicz <erh+git@nimenees.com>2014-03-22 21:15:41 -0400
commite2bbb5664c96d73f85fce6dbd44cd35aea5c1904 (patch)
treed8ffa8dea5a6d7803230c45724df749b6fa91e1f
parent9f26d96f0979efb8c8acf4901fd77265c9bf7e8d (diff)
downloadjson-c-e2bbb5664c96d73f85fce6dbd44cd35aea5c1904.tar.gz
Rename the "test_case" test to "test_charcase" to make it slightly less confusing.
-rw-r--r--.gitignore1
-rw-r--r--tests/Makefile.am29
-rw-r--r--tests/test_charcase.c (renamed from tests/test_case.c)0
-rw-r--r--tests/test_charcase.expected (renamed from tests/test_case.expected)0
-rwxr-xr-xtests/test_charcase.test (renamed from tests/test_case.test)2
5 files changed, 5 insertions, 27 deletions
diff --git a/.gitignore b/.gitignore
index d3e748e..15000ba 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 4fb3cb8..70f1fc1 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
index 936afee..936afee 100644
--- a/tests/test_case.c
+++ b/tests/test_charcase.c
diff --git a/tests/test_case.expected b/tests/test_charcase.expected
index d86bac9..d86bac9 100644
--- a/tests/test_case.expected
+++ b/tests/test_charcase.expected
diff --git a/tests/test_case.test b/tests/test_charcase.test
index ad0a099..c967475 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 $?