summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Android.mk5
-rw-r--r--testrunner.cc28
2 files changed, 31 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 855a3695ea..41d5a55a9a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -356,6 +356,7 @@ libchromeCommonUnittestSrc := \
base/values_unittest.cc \
base/vlog_unittest.cc \
testing/multiprocess_func_list.cc \
+ testrunner.cc \
libchromeHostCFlags := -D__ANDROID_HOST__
@@ -514,7 +515,7 @@ LOCAL_CFLAGS := $(libchromeCommonCFlags) $(libchromeHostCFlags) -DUNIT_TEST
LOCAL_CPPFLAGS := $(libchromeCommonCppFlags)
LOCAL_C_INCLUDES := $(libchromeCommonCIncludes)
LOCAL_SHARED_LIBRARIES := libchrome libevent-host
-LOCAL_STATIC_LIBRARIES := libgmock_host libgtest_host libBionicGtestMain
+LOCAL_STATIC_LIBRARIES := libgmock_host libgtest_host
LOCAL_LDLIBS := -lrt
include $(BUILD_HOST_NATIVE_TEST)
endif
@@ -534,5 +535,5 @@ LOCAL_CFLAGS := $(libchromeCommonCFlags) -DUNIT_TEST -DDONT_EMBED_BUILD_METADATA
LOCAL_CPPFLAGS := $(libchromeCommonCppFlags)
LOCAL_C_INCLUDES := $(libchromeCommonCIncludes)
LOCAL_SHARED_LIBRARIES := libchrome libevent
-LOCAL_STATIC_LIBRARIES := libgmock libgtest libBionicGtestMain
+LOCAL_STATIC_LIBRARIES := libgmock libgtest
include $(BUILD_NATIVE_TEST)
diff --git a/testrunner.cc b/testrunner.cc
new file mode 100644
index 0000000000..07117a53f3
--- /dev/null
+++ b/testrunner.cc
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+#include <gtest/gtest.h>
+
+#include "base/at_exit.h"
+#include "base/command_line.h"
+
+int main(int argc, char** argv) {
+ base::AtExitManager at_exit_manager;
+ base::CommandLine::Init(argc, argv);
+ ::testing::InitGoogleTest(&argc, argv);
+ return RUN_ALL_TESTS();
+}