diff options
| author | Dan Albert <danalbert@google.com> | 2016-08-11 14:35:16 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2016-09-13 13:29:51 -0700 |
| commit | cc5b45721e3c997ce8b0e08129ed2980be682d6b (patch) | |
| tree | 6c8d36f1533b36ded07f3acf131590481814b799 | |
| parent | 58896025729e9a96596dbb5e51313e9f643c5265 (diff) | |
| download | googletest-cc5b45721e3c997ce8b0e08129ed2980be682d6b.tar.gz | |
Fix executable name test for Android.
We build suffixed versions of this executable for the NDK versions.
Check those names too.
Longer term we should probably dump the tests into a different
directory so they can keep the correct name.
Test: ./run_tests.py
Bug: None
Change-Id: Ib78b5ae794ae51ae280ac243d295fe84cc182df5
| -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; |