diff options
| author | Cronet Mainline Eng <cronet-mainline-eng+copybara@google.com> | 2023-04-18 07:37:34 -0800 |
|---|---|---|
| committer | Patrick Rohr <prohr@google.com> | 2023-04-18 08:40:26 -0700 |
| commit | eddec18c18cdbcbdbbe9bf3c0fa24cb7f8d768ae (patch) | |
| tree | 2983326030c4b680835550dca47bc960e77c492f /buildtools/third_party/libc++abi | |
| parent | 41cb724250484f326b0bbd5f8b955eb37b3b83c6 (diff) | |
| download | cronet-eddec18c18cdbcbdbbe9bf3c0fa24cb7f8d768ae.tar.gz | |
Import Cronet version 114.0.5715.0
Project import generated by Copybara.
FolderOrigin-RevId: /tmp/copybara-origin/src
Test: none
Change-Id: I15627f4badf0f6173d24f6c555169cc815a29fdd
Diffstat (limited to 'buildtools/third_party/libc++abi')
| -rw-r--r-- | buildtools/third_party/libc++abi/trunk/test/catch_ptr_02.pass.cpp | 3 | ||||
| -rw-r--r-- | buildtools/third_party/libc++abi/trunk/test/configs/cmake-bridge.cfg.in | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/buildtools/third_party/libc++abi/trunk/test/catch_ptr_02.pass.cpp b/buildtools/third_party/libc++abi/trunk/test/catch_ptr_02.pass.cpp index 4683f818b..c7ef28a97 100644 --- a/buildtools/third_party/libc++abi/trunk/test/catch_ptr_02.pass.cpp +++ b/buildtools/third_party/libc++abi/trunk/test/catch_ptr_02.pass.cpp @@ -17,6 +17,7 @@ // XFAIL: stdlib=apple-libc++ && target={{.+}}-apple-macosx10.9 #include <cassert> +#include <stdint.h> #if __cplusplus < 201103L #define DISABLE_NULLPTR_TESTS @@ -136,7 +137,7 @@ void test7 () assert(false); } catch (base2 *p) { - assert ((unsigned long)p == 12+sizeof(base1)); + assert ((uintptr_t)p == 12+sizeof(base1)); } catch (...) { diff --git a/buildtools/third_party/libc++abi/trunk/test/configs/cmake-bridge.cfg.in b/buildtools/third_party/libc++abi/trunk/test/configs/cmake-bridge.cfg.in index d61303aa5..89b2dca6e 100644 --- a/buildtools/third_party/libc++abi/trunk/test/configs/cmake-bridge.cfg.in +++ b/buildtools/third_party/libc++abi/trunk/test/configs/cmake-bridge.cfg.in @@ -21,7 +21,7 @@ config.name = os.path.basename('@LIBCXXABI_TEST_CONFIG@') config.test_source_root = os.path.join('@LIBCXXABI_SOURCE_DIR@', 'test') config.test_format = libcxx.test.format.CxxStandardLibraryTest() config.recursiveExpansionLimit = 10 -config.test_exec_root = '@CMAKE_BINARY_DIR@' +config.test_exec_root = os.path.join('@CMAKE_BINARY_DIR@', 'test') # TODO: This is a non-standard Lit attribute and we should have another way of accessing this. config.host_triple = '@LLVM_HOST_TRIPLE@' |