diff options
| author | Qt CI Bot <qt_ci_bot@qt-project.org> | 2021-03-25 15:25:08 +0000 |
|---|---|---|
| committer | Qt CI Bot <qt_ci_bot@qt-project.org> | 2021-03-25 15:25:08 +0000 |
| commit | 9145650302d3cfe7df0fbc2a11f5d8f5f867897d (patch) | |
| tree | 127fbed0c253383f4427814c6948fd11dc0d83f8 /tests | |
| parent | 14eeb520858b624a2c9e09b5bd95ea8fb90a1f5a (diff) | |
| parent | 82c67623db5d9708d2565bed2e8f68ad3dd190b1 (diff) | |
Merge integration refs/builds/qtci/dev/1616671507
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/testlib/selftests/catch_p_p.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/auto/testlib/selftests/catch_p_p.h b/tests/auto/testlib/selftests/catch_p_p.h index 97ce7a24fd..596bfe63dd 100644 --- a/tests/auto/testlib/selftests/catch_p_p.h +++ b/tests/auto/testlib/selftests/catch_p_p.h @@ -7872,7 +7872,13 @@ namespace Catch { #ifdef CATCH_PLATFORM_MAC - #define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */ + // taken from Catch v3.0.0-preview.3 + #if defined(__i386__) || defined(__x86_64__) + #define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */ + #elif defined(__aarch64__) + #define CATCH_TRAP() __asm__(".inst 0xd4200000") + #endif + // end taken from Catch v3.0.0-preview.3 #elif defined(CATCH_PLATFORM_IPHONE) |