diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-04-04 11:35:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-04 11:35:28 -0400 |
| commit | 43776990663c08c4d207658bc5756058da1040bf (patch) | |
| tree | 8d874617167d0e2bffe793aede297036bc61597c | |
| parent | 07af8af37321892b022da63c3cd97688accd7483 (diff) | |
| parent | 1776ed8c1e9db8cfef66f79229a039023a7ceca0 (diff) | |
| download | googletest-43776990663c08c4d207658bc5756058da1040bf.tar.gz googletest-43776990663c08c4d207658bc5756058da1040bf.tar.bz2 googletest-43776990663c08c4d207658bc5756058da1040bf.zip | |
Merge pull request #1542 from gennadiycivil/master
Tweaking #1523 to exclude nacl, cl 191591810
| -rw-r--r-- | googletest/src/gtest.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index 725aa089..73e9bf86 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -4549,7 +4549,9 @@ void UnitTest::AddTestPartResult( // when a failure happens and both the --gtest_break_on_failure and // the --gtest_catch_exceptions flags are specified. DebugBreak(); -#elif (defined(__clang__) || defined(__GNUC__)) && (defined(__x86_64__) || defined(__i386__)) +#elif (!defined(__native_client__)) && \ + ((defined(__clang__) || defined(__GNUC__)) && \ + (defined(__x86_64__) || defined(__i386__))) // with clang/gcc we can achieve the same effect on x86 by invoking int3 asm("int3"); #else |