summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--compiler-rt/lib/sanitizer_common/tests/sanitizer_printf_test.cc6
-rw-r--r--compiler-rt/lib/sanitizer_common/tests/sanitizer_test_main.cc4
2 files changed, 7 insertions, 3 deletions
diff --git a/compiler-rt/lib/sanitizer_common/tests/sanitizer_printf_test.cc b/compiler-rt/lib/sanitizer_common/tests/sanitizer_printf_test.cc
index 5e39e0a591d..5a77b470caf 100644
--- a/compiler-rt/lib/sanitizer_common/tests/sanitizer_printf_test.cc
+++ b/compiler-rt/lib/sanitizer_common/tests/sanitizer_printf_test.cc
@@ -23,9 +23,9 @@ TEST(Printf, Basic) {
char buf[1024];
uptr len = internal_snprintf(buf, sizeof(buf),
"a%db%zdc%ue%zuf%xh%zxq%pe%sr",
- (int)-1, (long)-2, // NOLINT
- (unsigned)-4, (unsigned long)5, // NOLINT
- (unsigned)10, (unsigned long)11, // NOLINT
+ (int)-1, (uptr)-2, // NOLINT
+ (unsigned)-4, (uptr)5, // NOLINT
+ (unsigned)10, (uptr)11, // NOLINT
(void*)0x123, "_string_");
EXPECT_EQ(len, strlen(buf));
diff --git a/compiler-rt/lib/sanitizer_common/tests/sanitizer_test_main.cc b/compiler-rt/lib/sanitizer_common/tests/sanitizer_test_main.cc
index 20f8f53975d..55888d487e3 100644
--- a/compiler-rt/lib/sanitizer_common/tests/sanitizer_test_main.cc
+++ b/compiler-rt/lib/sanitizer_common/tests/sanitizer_test_main.cc
@@ -13,6 +13,10 @@
#include "gtest/gtest.h"
#include "sanitizer_common/sanitizer_flags.h"
+#ifdef _MSC_VER
+#pragma comment(linker, "/STACK:33554432")
+#endif
+
const char *argv0;
int main(int argc, char **argv) {
OpenPOWER on IntegriCloud