diff options
| author |  Josh Haberman <jhaberman@gmail.com> | 2015-04-14 13:45:39 -0700 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2015-04-15 14:56:05 -0700 |
| commit | 4e63b52088ce409bbe43e4a37863d43b136143f0 (patch) | |
| tree | fbd4b126e2f47dec22bf9fcf4dab618f70445f37 /conformance/Makefile.am | |
| parent | 8fe135d212baeae8b754f08af9cb1854ad0b627f (diff) | |
Factored conformance tests so they can run in-process.
This is necessary for testing on iOS.
Change-Id: I54ec1e3aa2e9fbfff9a6cd6580920a6a62069b63
Diffstat (limited to 'conformance/Makefile.am')
| -rw-r--r-- | conformance/Makefile.am | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/conformance/Makefile.am b/conformance/Makefile.am index 2e1de17d..0c4eae75 100644 --- a/conformance/Makefile.am +++ b/conformance/Makefile.am @@ -7,12 +7,12 @@ protoc_outputs = \ conformance.pb.cc \ conformance.pb.h -bin_PROGRAMS = conformance-test conformance-cpp +bin_PROGRAMS = conformance-test-runner conformance-cpp -conformance_test_LDADD = $(top_srcdir)/src/libprotobuf.la -conformance_test_SOURCES = conformance_test.cc -nodist_conformance_test_SOURCES = conformance.pb.cc -conformance_test_CPPFLAGS = -I$(top_srcdir)/src +conformance_test_runner_LDADD = $(top_srcdir)/src/libprotobuf.la +conformance_test_runner_SOURCES = conformance_test.cc conformance_test_runner.cc +nodist_conformance_test_runner_SOURCES = conformance.pb.cc +conformance_test_runner_CPPFLAGS = -I$(top_srcdir)/src conformance_cpp_LDADD = $(top_srcdir)/src/libprotobuf.la conformance_cpp_SOURCES = conformance_cpp.cc @@ -46,5 +46,5 @@ MAINTAINERCLEANFILES = \ Makefile.in # Targets for actually running tests. -test_cpp: unittest_proto_middleman conformance-test conformance-cpp - ./conformance-test ./conformance-cpp +test_cpp: unittest_proto_middleman conformance-test-runner conformance-cpp + ./conformance-test-runner ./conformance-cpp |