Merge lp:~mordred/gearmand/add-gtest into lp:gearmand/1.0

Proposed by Monty Taylor on 2010-06-29
Status: Superseded
Proposed branch: lp:~mordred/gearmand/add-gtest
Merge into: lp:gearmand/1.0
Diff against target: 94 lines (+28/-2)
5 files modified
.bzrignore (+1/-0)
Makefile.am (+4/-0)
configure.ac (+1/-1)
tests/include.am (+1/-1)
unittests/main.cc (+21/-0)
To merge this branch: bzr merge lp:~mordred/gearmand/add-gtest
Reviewer Review Type Date Requested Status
Brian Aker 2010-06-29 Pending
Review via email: mp+28782@code.launchpad.net

This proposal has been superseded by a proposal from 2010-06-30.

Description of the change

adds gtest support

To post a comment you must log in.
lp:~mordred/gearmand/add-gtest updated on 2010-06-30
354. By Monty Taylor on 2010-06-30

Moved unittests to unittests/.
Added unit target.
Removed -Werror from unittests.

355. By Monty Taylor on 2010-06-30

Added include.am. Doh.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '.bzrignore'
--- .bzrignore 2010-04-04 21:27:36 +0000
+++ .bzrignore 2010-06-30 15:25:44 +0000
@@ -76,3 +76,4 @@
76tests/tokyocabinet_test.res76tests/tokyocabinet_test.res
77tests/worker_test77tests/worker_test
78tests/worker_test.res78tests/worker_test.res
79tests/unittests
7980
=== modified file 'Makefile.am'
--- Makefile.am 2010-01-28 21:37:08 +0000
+++ Makefile.am 2010-06-30 15:25:44 +0000
@@ -17,6 +17,7 @@
17noinst_HEADERS =17noinst_HEADERS =
18EXTRA_DIST = 18EXTRA_DIST =
19CLEANFILES =19CLEANFILES =
20TESTS =
2021
2122
22include benchmark/include.am23include benchmark/include.am
@@ -26,10 +27,13 @@
26include libgearman/include.am27include libgearman/include.am
27include libgearman-server/include.am28include libgearman-server/include.am
28include tests/include.am29include tests/include.am
30include unittests/include.am
29include support/include.am31include support/include.am
3032
31include docs/man_list33include docs/man_list
3234
35TESTS += ${check_PROGRAMS}
36
33EXTRA_DIST+= \37EXTRA_DIST+= \
34 docs/Doxyfile.api \38 docs/Doxyfile.api \
35 docs/Doxyfile.dev \39 docs/Doxyfile.dev \
3640
=== modified file 'configure.ac'
--- configure.ac 2010-06-30 08:35:50 +0000
+++ configure.ac 2010-06-30 15:25:44 +0000
@@ -31,7 +31,7 @@
31PANDORA_REQUIRE_LIBEVENT31PANDORA_REQUIRE_LIBEVENT
32PANDORA_REQUIRE_LIBUUID32PANDORA_REQUIRE_LIBUUID
3333
3434PANDORA_HAVE_LIBGTEST
35PANDORA_HAVE_BETTER_MALLOC35PANDORA_HAVE_BETTER_MALLOC
36PANDORA_HAVE_LIBSQLITE336PANDORA_HAVE_LIBSQLITE3
37PANDORA_HAVE_LIBDRIZZLE37PANDORA_HAVE_LIBDRIZZLE
3838
=== modified file 'tests/include.am'
--- tests/include.am 2010-06-30 02:10:27 +0000
+++ tests/include.am 2010-06-30 15:25:44 +0000
@@ -9,7 +9,6 @@
9noinst_LTLIBRARIES+= tests/libtest.la9noinst_LTLIBRARIES+= tests/libtest.la
10tests_libtest_la_SOURCES= tests/test.c tests/test_gearmand.c10tests_libtest_la_SOURCES= tests/test.c tests/test_gearmand.c
1111
12
13VALGRIND_COMMAND= $(LIBTOOL) --mode=execute valgrind --leak-check=yes --show-reachable=yes12VALGRIND_COMMAND= $(LIBTOOL) --mode=execute valgrind --leak-check=yes --show-reachable=yes
1413
15TEST_LDADD= \14TEST_LDADD= \
@@ -17,6 +16,7 @@
17 libgearman/libgearman.la \16 libgearman/libgearman.la \
18 libgearman-server/libgearman-server.la17 libgearman-server/libgearman-server.la
1918
19
20if HAVE_LIBMEMCACHED20if HAVE_LIBMEMCACHED
21if HAVE_MEMCACHED21if HAVE_MEMCACHED
22LIBMEMCACHED_PIDFILE = ${abs_top_builddir}/tests/Xumemc.pid22LIBMEMCACHED_PIDFILE = ${abs_top_builddir}/tests/Xumemc.pid
2323
=== added directory 'unittests'
=== added file 'unittests/main.cc'
--- unittests/main.cc 1970-01-01 00:00:00 +0000
+++ unittests/main.cc 2010-06-30 15:25:44 +0000
@@ -0,0 +1,21 @@
1/* -*- mode: c; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2 * vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3 *
4 * Copyright (C) 2010 Monty Taylor
5 *
6 * All rights reserved.
7 *
8 * Use and distribution licensed under the BSD license. See
9 * the COPYING file in the parent directory for full text.
10 */
11
12#include "config.h"
13
14#include <gtest/gtest.h>
15
16
17int main(int argc, char **argv)
18{
19 ::testing::InitGoogleTest(&argc, argv);
20 return RUN_ALL_TESTS();
21}

Subscribers

People subscribed via source and target branches