diff options
| author | vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925> | 2012-09-19 17:58:01 +0000 |
|---|---|---|
| committer | vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925> | 2012-09-19 17:58:01 +0000 |
| commit | 78bf6d5724e733cce313228856e18d5c372b4fb3 (patch) | |
| tree | 1a0e97a3ff6a98ca233732392ae3ccf322df2bdb /test/gtest_unittest.cc | |
| parent | b535c1767e7ec4e9675bb7257d9bc34a84949741 (diff) | |
| download | googletest-78bf6d5724e733cce313228856e18d5c372b4fb3.tar.gz googletest-78bf6d5724e733cce313228856e18d5c372b4fb3.tar.bz2 googletest-78bf6d5724e733cce313228856e18d5c372b4fb3.zip | |
Improves Android support (by David Turner).
Diffstat (limited to 'test/gtest_unittest.cc')
| -rw-r--r-- | test/gtest_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/gtest_unittest.cc b/test/gtest_unittest.cc index 31a45656..79e11b62 100644 --- a/test/gtest_unittest.cc +++ b/test/gtest_unittest.cc @@ -1275,7 +1275,7 @@ TEST(StringTest, FormatWorks) { EXPECT_STREQ("<formatting error or buffer exceeded>", String::Format("x%s", buffer).c_str()); -#if GTEST_OS_LINUX +#if GTEST_OS_LINUX && !GTEST_OS_LINUX_ANDROID // On Linux, invalid format spec should lead to an error message. // In other environment (e.g. MSVC on Windows), String::Format() may // simply ignore a bad format spec, so this assertion is run on |