diff options
| author | Dan Albert <danalbert@google.com> | 2016-09-13 23:00:16 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-13 23:00:16 +0000 |
| commit | 2456b09e8439ed059ca088441aa34085885405bb (patch) | |
| tree | 6c8d36f1533b36ded07f3acf131590481814b799 | |
| parent | c13c527176c5fded31ed5b844fd0743044ee3464 (diff) | |
| parent | bd59c46408561eaaf89f9ff1b8de949da273b1ab (diff) | |
| download | googletest-2456b09e8439ed059ca088441aa34085885405bb.tar.gz | |
Fix executable name test for Android. am: cc5b45721e am: 21161f7b39 am: 0e4aee4eb0
am: bd59c46408
Change-Id: Id5d9c930e72f7b842419c14d5c7647796d447c3f
| -rw-r--r-- | googletest/test/gtest-options_test.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/googletest/test/gtest-options_test.cc b/googletest/test/gtest-options_test.cc index 5586dc3b..bab4360f 100644 --- a/googletest/test/gtest-options_test.cc +++ b/googletest/test/gtest-options_test.cc @@ -118,7 +118,13 @@ TEST(OutputFileHelpersTest, GetCurrentExecutableName) { exe_str == "gtest-options_test" || exe_str == "gtest_all_test" || exe_str == "lt-gtest_all_test" || - exe_str == "gtest_dll_test"; + exe_str == "gtest_dll_test" +#ifdef __ANDROID__ + || exe_str == "gtest-options_test_ndk_c++" || + exe_str == "gtest-options_test_ndk_gnustl" || + exe_str == "gtest-options_test_ndk_stlport" +#endif + ; #endif // GTEST_OS_WINDOWS if (!success) FAIL() << "GetCurrentExecutableName() returns " << exe_str; |