[libcxx-commits] [PATCH] D97497: [libcxx] [test] Disable allocation checks in class.path tests on windows

[Martin Storsjö via Phabricator via libcxx-commits]

mstorsjo updated this revision to Diff 329562.
mstorsjo edited the summary of this revision.
mstorsjo added a comment.

Updated with comments added, ping for second approval


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D97497/new/

https://reviews.llvm.org/D97497

Files:
  libcxx/test/std/input.output/filesystems/class.path/path.member/path.append.pass.cpp
  libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/source.pass.cpp
  libcxx/test/std/input.output/filesystems/class.path/path.member/path.concat.pass.cpp
  libcxx/test/std/input.output/filesystems/class.path/path.member/path.generic.obs/generic_string_alloc.pass.cpp
  libcxx/test/std/input.output/filesystems/class.path/path.member/path.native.obs/string_alloc.pass.cpp


Index: libcxx/test/std/input.output/filesystems/class.path/path.member/path.native.obs/string_alloc.pass.cpp
===================================================================
--- libcxx/test/std/input.output/filesystems/class.path/path.member/path.native.obs/string_alloc.pass.cpp
+++ libcxx/test/std/input.output/filesystems/class.path/path.member/path.native.obs/string_alloc.pass.cpp
@@ -25,6 +25,12 @@
 #include <type_traits>
 #include <cassert>
 
+#ifdef _WIN32
+// On Windows, charset conversions cause allocations in the path class in
+// cases where no allocations are done on other platforms.
+#define DISABLE_NEW_COUNT
+#endif
+
 #include "test_macros.h"
 #include "test_iterators.h"
 #include "count_new.h"
Index: libcxx/test/std/input.output/filesystems/class.path/path.member/path.generic.obs/generic_string_alloc.pass.cpp
===================================================================
--- libcxx/test/std/input.output/filesystems/class.path/path.member/path.generic.obs/generic_string_alloc.pass.cpp
+++ libcxx/test/std/input.output/filesystems/class.path/path.member/path.generic.obs/generic_string_alloc.pass.cpp
@@ -24,6 +24,12 @@
 #include <type_traits>
 #include <cassert>
 
+#ifdef _WIN32
+// On Windows, charset conversions cause allocations in the path class in
+// cases where no allocations are done on other platforms.
+#define DISABLE_NEW_COUNT
+#endif
+
 #include "test_macros.h"
 #include "test_iterators.h"
 #include "count_new.h"
Index: libcxx/test/std/input.output/filesystems/class.path/path.member/path.concat.pass.cpp
===================================================================
--- libcxx/test/std/input.output/filesystems/class.path/path.member/path.concat.pass.cpp
+++ libcxx/test/std/input.output/filesystems/class.path/path.member/path.concat.pass.cpp
@@ -36,6 +36,12 @@
 #include <string_view>
 #include <cassert>
 
+#ifdef _WIN32
+// On Windows, charset conversions cause allocations in the path class in
+// cases where no allocations are done on other platforms.
+#define DISABLE_NEW_COUNT
+#endif
+
 #include "test_macros.h"
 #include "test_iterators.h"
 #include "count_new.h"
Index: libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/source.pass.cpp
===================================================================
--- libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/source.pass.cpp
+++ libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/source.pass.cpp
@@ -29,6 +29,12 @@
 #include <string_view>
 #include <cassert>
 
+#ifdef _WIN32
+// On Windows, charset conversions cause allocations in the path class in
+// cases where no allocations are done on other platforms.
+#define DISABLE_NEW_COUNT
+#endif
+
 #include "test_macros.h"
 #include "test_iterators.h"
 #include "count_new.h"
Index: libcxx/test/std/input.output/filesystems/class.path/path.member/path.append.pass.cpp
===================================================================
--- libcxx/test/std/input.output/filesystems/class.path/path.member/path.append.pass.cpp
+++ libcxx/test/std/input.output/filesystems/class.path/path.member/path.append.pass.cpp
@@ -29,6 +29,12 @@
 #include <string_view>
 #include <cassert>
 
+#ifdef _WIN32
+// On Windows, charset conversions cause allocations in the path class in
+// cases where no allocations are done on other platforms.
+#define DISABLE_NEW_COUNT
+#endif
+
 #include "test_macros.h"
 #include "test_iterators.h"
 #include "count_new.h"


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D97497.329562.patch
Type: text/x-patch
Size: 3495 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20210310/c863d983/attachment.bin>