Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(978)

Unified Diff: src/Makefile.am

Issue 6395007: cashew: gmock integration (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/cashew.git@master
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « configure.ac ('k') | src/cashew_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/Makefile.am
diff --git a/src/Makefile.am b/src/Makefile.am
index 44d7d3c711158a2c157a1c27b6e96971d82d5db5..d3a9230d0bef39caf124637ad98e44d5af8227ee 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
+# Copyright (c) 2010, 2011 The Chromium OS Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
@@ -25,6 +25,8 @@ libcashew_la_SOURCES = \
default_policy.cc \
device.h \
device.cc \
+ device_impl.h \
+ device_impl.cc \
http_fetcher.h \
json_reader.h \
json_reader.cc \
@@ -38,8 +40,12 @@ libcashew_la_SOURCES = \
property_changed_handler.cc \
service.h \
service.cc \
+ service_impl.h \
+ service_impl.cc \
service_manager.h \
service_manager.cc \
+ service_manager_impl.h \
+ service_manager_impl.cc \
values.h \
values.cc
@@ -127,18 +133,26 @@ cashew_unittest_SOURCES = \
cashew_unittest.cc \
data_plan_unittest.cc \
default_policy_unittest.cc \
+ device_mock.h \
json_reader_unittest.cc \
procfs_byte_counter_unittest.cc \
+ service_manager_mock.h \
+ service_mock.h \
values_unittest.cc
+GMOCK_CFLAGS =
+GMOCK_LIBS = -lgmock
+
GTEST_CFLAGS =
GTEST_LIBS = -lgtest
cashew_unittest_CXXFLAGS = \
$(COMMON_CFLAGS) \
+ $(GMOCK_CFLAGS) \
$(GTEST_CFLAGS)
cashew_unittest_LDADD = \
$(LIBCASHEW) \
$(COMMON_LIBS) \
+ $(GMOCK_LIBS) \
$(GTEST_LIBS)
« no previous file with comments | « configure.ac ('k') | src/cashew_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698