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
1=== modified file '.bzrignore'
2--- .bzrignore 2010-04-04 21:27:36 +0000
3+++ .bzrignore 2010-06-30 15:25:44 +0000
4@@ -76,3 +76,4 @@
5 tests/tokyocabinet_test.res
6 tests/worker_test
7 tests/worker_test.res
8+tests/unittests
9
10=== modified file 'Makefile.am'
11--- Makefile.am 2010-01-28 21:37:08 +0000
12+++ Makefile.am 2010-06-30 15:25:44 +0000
13@@ -17,6 +17,7 @@
14 noinst_HEADERS =
15 EXTRA_DIST =
16 CLEANFILES =
17+TESTS =
18
19
20 include benchmark/include.am
21@@ -26,10 +27,13 @@
22 include libgearman/include.am
23 include libgearman-server/include.am
24 include tests/include.am
25+include unittests/include.am
26 include support/include.am
27
28 include docs/man_list
29
30+TESTS += ${check_PROGRAMS}
31+
32 EXTRA_DIST+= \
33 docs/Doxyfile.api \
34 docs/Doxyfile.dev \
35
36=== modified file 'configure.ac'
37--- configure.ac 2010-06-30 08:35:50 +0000
38+++ configure.ac 2010-06-30 15:25:44 +0000
39@@ -31,7 +31,7 @@
40 PANDORA_REQUIRE_LIBEVENT
41 PANDORA_REQUIRE_LIBUUID
42
43-
44+PANDORA_HAVE_LIBGTEST
45 PANDORA_HAVE_BETTER_MALLOC
46 PANDORA_HAVE_LIBSQLITE3
47 PANDORA_HAVE_LIBDRIZZLE
48
49=== modified file 'tests/include.am'
50--- tests/include.am 2010-06-30 02:10:27 +0000
51+++ tests/include.am 2010-06-30 15:25:44 +0000
52@@ -9,7 +9,6 @@
53 noinst_LTLIBRARIES+= tests/libtest.la
54 tests_libtest_la_SOURCES= tests/test.c tests/test_gearmand.c
55
56-
57 VALGRIND_COMMAND= $(LIBTOOL) --mode=execute valgrind --leak-check=yes --show-reachable=yes
58
59 TEST_LDADD= \
60@@ -17,6 +16,7 @@
61 libgearman/libgearman.la \
62 libgearman-server/libgearman-server.la
63
64+
65 if HAVE_LIBMEMCACHED
66 if HAVE_MEMCACHED
67 LIBMEMCACHED_PIDFILE = ${abs_top_builddir}/tests/Xumemc.pid
68
69=== added directory 'unittests'
70=== added file 'unittests/main.cc'
71--- unittests/main.cc 1970-01-01 00:00:00 +0000
72+++ unittests/main.cc 2010-06-30 15:25:44 +0000
73@@ -0,0 +1,21 @@
74+/* -*- mode: c; c-basic-offset: 2; indent-tabs-mode: nil; -*-
75+ * vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
76+ *
77+ * Copyright (C) 2010 Monty Taylor
78+ *
79+ * All rights reserved.
80+ *
81+ * Use and distribution licensed under the BSD license. See
82+ * the COPYING file in the parent directory for full text.
83+ */
84+
85+#include "config.h"
86+
87+#include <gtest/gtest.h>
88+
89+
90+int main(int argc, char **argv)
91+{
92+ ::testing::InitGoogleTest(&argc, argv);
93+ return RUN_ALL_TESTS();
94+}

Subscribers

People subscribed via source and target branches