libmemcached

Merge lp:~mordred/libmemcached/rework-gtest into lp:~tangent-org/libmemcached/trunk

  1. rework-gtest
  2. Merge into trunk
Proposed by Monty Taylor
Status: Merged
Merged at revision: 871
Proposed branch: lp:~mordred/libmemcached/rework-gtest
Merge into: lp:~tangent-org/libmemcached/trunk
Diff against target: 64 lines (+11/-14)
3 files modified
Makefile.am (+0/-2)
tests/include.am (+4/-2)
unittests/include.am (+7/-10)
To merge this branch: bzr merge lp:~mordred/libmemcached/rework-gtest
Reviewer Review Type Date Requested Status
Brian Aker Pending
Review via email: mp+28906@code.launchpad.net

Description of the change

Reworked the Werror problems on freebsd.
Merged Brian's fixes to running unittests back in to how we're doing this elsewhere.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.am'
2--- Makefile.am 2010-06-29 22:04:05 +0000
3+++ Makefile.am 2010-06-30 15:29:22 +0000
4@@ -45,8 +45,6 @@
5
6 TESTS += ${check_PROGRAMS}
7
8-check-local: test-no-outputdiff
9-
10
11 fedora:
12 rm -f ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
13
14=== modified file 'tests/include.am'
15--- tests/include.am 2010-06-29 23:26:22 +0000
16+++ tests/include.am 2010-06-30 15:29:22 +0000
17@@ -89,10 +89,12 @@
18 tests_memplus_DEPENDENCIES = tests/libtest.la tests/libserver.la libmemcached/libmemcached.la
19 tests_memplus_LDADD = $(tests_memplus_DEPENDENCIES)
20
21-test: unittests-run test-docs test-mem test-hash memcapable
22+test: check
23+
24+check-local: test-docs test-mem test-hash memcapable
25 echo "Tests completed"
26
27-test-x: test-docs test-plus test-mem test-hash memcapable test-memcat test-memcp test-memrm test-memerror test-memdump test-memflush test-memstat
28+test-x: check-local test-plus test-memcat test-memcp test-memrm test-memerror test-memdump test-memflush test-memstat
29 echo "Tests completed"
30
31 memcapable: clients/memcapable
32
33=== modified file 'unittests/include.am'
34--- unittests/include.am 2010-06-29 22:04:05 +0000
35+++ unittests/include.am 2010-06-30 15:29:22 +0000
36@@ -3,21 +3,18 @@
37 # All paths should be given relative to the root
38
39 if HAVE_LIBGTEST
40-UNITTEST_PROGRAM= unittests/unittests
41-
42-noinst_PROGRAMS += $(UNITTEST_PROGRAM)
43+check_PROGRAMS += unittests/unittests
44+endif
45
46 unittests_unittests_SOURCES= \
47- unittests/strings.cc \
48- unittests/main.cc
49+ unittests/main.cc \
50+ unittests/strings.cc
51+
52+unittests_unittest_CXXFLAGS= ${AM_CXXFLAGS} ${NO_WERROR}
53 unittests_unittests_LDADD= \
54 tests/libserver.la \
55 libmemcached/libmemcachedinternal.la \
56 ${TESTS_LDADDS} ${LTLIBGTEST}
57-endif
58-
59 # Shorthand
60-unit: unittests-run
61+unit: check-TESTS
62
63-unittests-run: $(UNITTEST_PROGRAM)
64- $(UNITTEST_PROGRAM)

Subscribers

People subscribed via source and target branches

to all changes: