diff options
| author | Dan Albert <danalbert@google.com> | 2017-12-13 02:40:52 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-12-13 02:40:52 +0000 |
| commit | 885e694ec4bbdb0c1c4e15332a9a8b151bf34e2e (patch) | |
| tree | 01fad1f482b80a94c0943287500f696582fb0da9 | |
| parent | d3b435e61aa96f9566e26e231696a0383152e278 (diff) | |
| parent | 5c682bd23d115ee8c7c5b89fa096055ea1c9319c (diff) | |
| download | googletest-885e694ec4bbdb0c1c4e15332a9a8b151bf34e2e.tar.gz | |
Enable more tests now that the NDK can handle them. am: 906ba0a004
am: 5c682bd23d
Change-Id: Id12736ac04c3011b7d86f30913424066dd0c557f
| -rw-r--r-- | googletest/Android.mk | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/googletest/Android.mk b/googletest/Android.mk index 1dddb0e6..7d14c258 100644 --- a/googletest/Android.mk +++ b/googletest/Android.mk @@ -61,9 +61,8 @@ endef # The NDK variant of gtest-death-test_test is disabled because we don't have # pthread_atfork on android-9. define gtest-test-suite - $(if $(findstring _ndk,$(1)),, \ - $(eval $(call gtest-unit-test, \ - gtest-death-test_test,,libgtest_main,$(1),$(2)))) \ + $(eval $(call gtest-unit-test, \ + gtest-death-test_test,,libgtest_main,$(1),$(2))) \ $(eval $(call gtest-unit-test,gtest_environment_test,,,$(1),$(2))) \ $(eval $(call gtest-unit-test,gtest-filepath_test,, \ libgtest_main,$(1),$(2))) \ @@ -96,15 +95,13 @@ define gtest-test-suite gtest-typed-test_test,test/gtest-typed-test2_test.cc, \ libgtest_main,$(1),$(2))) \ $(eval $(call gtest-unit-test,gtest_unittest,,libgtest_main,$(1),$(2))) \ - $(eval $(call gtest-unit-test,gtest-unittest-api_test,,,$(1),$(2))) + $(eval $(call gtest-unit-test,gtest-unittest-api_test,,,$(1),$(2))) \ + $(eval $(call gtest-unit-test,gtest-printers_test,,libgtest_main,$(1),$(2))) endef # Test is disabled because Android doesn't build gtest with exceptions. # $(eval $(call gtest-unit-test,gtest_throw_on_failure_ex_test,,,$(1),$(2))) -# Test is disabled until https://github.com/google/googletest/pull/728 lands. -# $(eval $(call gtest-unit-test,gtest-printers_test,,libgtest_main,$(1),$(2))) - # If we're being invoked from ndk-build, we'll have NDK_ROOT defined. ifdef NDK_ROOT |