aboutsummaryrefslogtreecommitdiffstats
path: root/www/iridium/files/patch-base_files_file__util__unittest.cc
diff options
context:
space:
mode:
authorLexi Winter <ivy@FreeBSD.org>2025-12-01 03:19:41 +0000
committerLexi Winter <ivy@FreeBSD.org>2025-12-01 03:19:41 +0000
commit2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch)
tree25f0138e1af8902b92dacc8cce09b267447c17db /www/iridium/files/patch-base_files_file__util__unittest.cc
parentf85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff)
parent1a30da80670973368b399f2b01fe9c04b91a1273 (diff)
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'www/iridium/files/patch-base_files_file__util__unittest.cc')
-rw-r--r--www/iridium/files/patch-base_files_file__util__unittest.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/www/iridium/files/patch-base_files_file__util__unittest.cc b/www/iridium/files/patch-base_files_file__util__unittest.cc
index 9be0bc93987f..31e6057e8372 100644
--- a/www/iridium/files/patch-base_files_file__util__unittest.cc
+++ b/www/iridium/files/patch-base_files_file__util__unittest.cc
@@ -1,6 +1,6 @@
---- base/files/file_util_unittest.cc.orig 2025-09-11 13:19:19 UTC
+--- base/files/file_util_unittest.cc.orig 2025-11-06 10:11:34 UTC
+++ base/files/file_util_unittest.cc
-@@ -4101,7 +4101,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
+@@ -4156,7 +4156,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
}
#endif // BUILDFLAG(IS_WIN)
@@ -9,7 +9,7 @@
TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) {
FilePath file_path("/proc/cpuinfo");
std::string data = "temp";
-@@ -4686,6 +4686,19 @@ TEST_F(FileUtilTest, CreateDirectoryOnlyCheckMissingSu
+@@ -4741,6 +4741,19 @@ TEST_F(FileUtilTest, CreateDirectoryOnlyCheckMissingSu
#endif // BUILDFLAG(IS_ANDROID)
@@ -29,7 +29,7 @@
#if BUILDFLAG(IS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING) && \
defined(ARCH_CPU_32_BITS)
// TODO(crbug.com/327582285): Re-enable these tests. They may be failing due to
-@@ -4852,7 +4865,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
+@@ -4907,7 +4920,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
NULL);
#else
size_t bytes_written =