diff options
| author | Jorge Lucangeli Obes <jorgelo@google.com> | 2017-02-04 00:25:29 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-04 00:25:29 +0000 |
| commit | 4fe205840b2eac72cd7492a6def768958645b281 (patch) | |
| tree | 3b18563cc7106f4df4054a24e36de5c9c861b399 | |
| parent | 4c995c9f6887b7eb23dbd589f7c43b60740a49d2 (diff) | |
| parent | 5ace525c9b6f42ab381caceca7813a106492c6ce (diff) | |
| download | minijail-4fe205840b2eac72cd7492a6def768958645b281.tar.gz | |
Make unit tests build and run on Chrome OS. am: e0c5a76990 am: 8c01e2728f
am: 5ace525c9b
Change-Id: Ifa7c0f72184b702cb6b913a6103fab45405c7b55
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | Makefile | 14 |
2 files changed, 10 insertions, 7 deletions
@@ -12,5 +12,8 @@ libminijail_unittest minijail0 syscall_filter_unittest +# common.mk TEST(). +*.test + # Google Test. googletest-release* @@ -16,17 +16,17 @@ ifneq ($(USE_seccomp),yes) CPPFLAGS += -DUSE_SECCOMP_SOFTFAIL endif -CFLAGS += -Wextra -CXXFLAGS += -Wextra +CFLAGS += -Wextra -Wno-missing-field-initializers +CXXFLAGS += -Wextra -Wno-missing-field-initializers USE_SYSTEM_GTEST ?= no ifeq ($(USE_SYSTEM_GTEST),no) -GTEST_CXXFLAGS := +GTEST_CXXFLAGS := -std=gnu++11 GTEST_MAIN := gtest_main.a GTEST_LIBS := gtest.a else GTEST_CXXFLAGS := $(gtest-config --cxxflags) -GTEST_MAIN := -lgtest_main +GTEST_MAIN := -lgtest -lgtest_main GTEST_LIBS := $(gtest-config --libs) endif @@ -35,8 +35,8 @@ all: CC_BINARY(minijail0) CC_LIBRARY(libminijail.so) \ parse_seccomp_policy: CXX_BINARY(parse_seccomp_policy) -# TODO(jorgelo): convert to TEST(). -tests: CXX_BINARY(libminijail_unittest) CXX_BINARY(syscall_filter_unittest) +tests: TEST(CXX_BINARY(libminijail_unittest)) \ + TEST(CXX_BINARY(syscall_filter_unittest)) CC_BINARY(minijail0): LDLIBS += -lcap -ldl @@ -132,7 +132,7 @@ GTEST_DIR = googletest-release-1.8.0/googletest CPPFLAGS += -isystem $(GTEST_DIR)/include # Flags passed to the C++ compiler. -GTEST_CXXFLAGS := -pthread +GTEST_CXXFLAGS += -pthread # All Google Test headers. Usually you shouldn't change this # definition. |