Browse Source
Create a tests subdirectory and move one of the test to there.
tags/json-c-0.10-20120530
Eric Haszlakiewicz
13 years ago
7 changed files with 35 additions and 7 deletions
Unified View
Diff Options
-
+4 -6Makefile.am
-
+2 -0Makefile.am.inc
-
+7 -1configure.in
-
+22 -0tests/Makefile.am
-
+0 -0tests/test1.c
-
+0 -0tests/test1.expected
-
+0 -0tests/test1.test
+ 4
- 6
Makefile.am
View File
| @@ -1,6 +1,7 @@ | |||||
| AM_CFLAGS = -Wall -Wwrite-strings -Werror -std=gnu99 -D_GNU_SOURCE -D_REENTRANT | |||||
| include Makefile.am.inc | |||||
| EXTRA_DIST = README.html README-WIN32.html config.h.win32 doc json-c.vcproj | EXTRA_DIST = README.html README-WIN32.html config.h.win32 doc json-c.vcproj | ||||
| SUBDIRS = . tests | |||||
| lib_LTLIBRARIES = libjson.la | lib_LTLIBRARIES = libjson.la | ||||
| @@ -38,10 +39,7 @@ libjson_la_SOURCES = \ | |||||
| linkhash.c \ | linkhash.c \ | ||||
| printbuf.c | printbuf.c | ||||
| check_PROGRAMS = test1 test2 test4 test_parse_int64 test_null test_cast test_parse | |||||
| test1_SOURCES = test1.c | |||||
| test1_LDADD = $(lib_LTLIBRARIES) | |||||
| check_PROGRAMS = test2 test4 test_parse_int64 test_null test_cast test_parse | |||||
| test2_SOURCES = test2.c | test2_SOURCES = test2.c | ||||
| test2_LDADD = $(lib_LTLIBRARIES) | test2_LDADD = $(lib_LTLIBRARIES) | ||||
| @@ -61,7 +59,7 @@ test_cast_LDADD = $(lib_LTLIBRARIES) | |||||
| test_parse_SOURCES = test_parse.c | test_parse_SOURCES = test_parse.c | ||||
| test_parse_LDADD = $(lib_LTLIBRARIES) | test_parse_LDADD = $(lib_LTLIBRARIES) | ||||
| TESTS = test1.test test2.test test4.test parse_int64.test test_null.test test_cast.test test_parse.test | |||||
| TESTS = test2.test test4.test parse_int64.test test_null.test test_cast.test test_parse.test | |||||
| EXTRA_DIST += $(TESTS) | EXTRA_DIST += $(TESTS) | ||||
| testsubdir=testSubDir | testsubdir=testSubDir | ||||
| TESTS_ENVIRONMENT = top_builddir=$(top_builddir) | TESTS_ENVIRONMENT = top_builddir=$(top_builddir) | ||||
+ 2
- 0
Makefile.am.inc
View File
| @@ -0,0 +1,2 @@ | |||||
| AM_CFLAGS = -Wall -Wwrite-strings -Werror -std=gnu99 -D_GNU_SOURCE -D_REENTRANT | |||||
+ 7
- 1
configure.in
View File
| @@ -5,6 +5,8 @@ AC_INIT([json-c], 0.10, [json-c@googlegroups.com]) | |||||
| AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) | AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) | ||||
| AC_PROG_MAKE_SET | |||||
| # Checks for programs. | # Checks for programs. | ||||
| # Checks for libraries. | # Checks for libraries. | ||||
| @@ -29,7 +31,11 @@ AC_CHECK_FUNCS(strndup strerror vsnprintf vasprintf open vsyslog strncasecmp) | |||||
| AM_PROG_LIBTOOL | AM_PROG_LIBTOOL | ||||
| AC_OUTPUT([ | |||||
| AC_CONFIG_FILES([ | |||||
| Makefile | Makefile | ||||
| json.pc | json.pc | ||||
| tests/Makefile | |||||
| ]) | ]) | ||||
| AC_OUTPUT | |||||
+ 22
- 0
tests/Makefile.am
View File
| @@ -0,0 +1,22 @@ | |||||
| include ../Makefile.am.inc | |||||
| #lib_LTLIBRARIES = ../libjson.la | |||||
| #check_PROGRAMS = test1 test2 test4 test_parse_int64 test_null test_cast test_parse | |||||
| check_PROGRAMS = test1 | |||||
| #test1_SOURCES = test1.c | |||||
| #test1_LDADD = $(lib_LTLIBRARIES) | |||||
| test1_LDADD = $(top_builddir)/libjson.la | |||||
| #TESTS = test1.test test2.test test4.test parse_int64.test test_null.test test_cast.test test_parse.test | |||||
| TESTS = test1.test | |||||
| EXTRA_DIST= | |||||
| EXTRA_DIST += $(TESTS) | |||||
| testsubdir=testSubDir | |||||
| TESTS_ENVIRONMENT = top_builddir=$(top_builddir) | |||||
| distclean-local: | |||||
| -rm -rf $(testsubdir) | |||||