3party/googletest
0
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2024-12-31 05:33:02 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into fix_locale_win

Browse Source
This commit is contained in:
Gennadiy Civil 2018-04-04 13:58:55 -04:00 committed by GitHub
commit fbe3c94533
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
googletest/src/gtest.cc
View File

@ -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