diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /devel/electron35/files/patch-base_system_sys__info__unittest.cc | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'devel/electron35/files/patch-base_system_sys__info__unittest.cc')
| -rw-r--r-- | devel/electron35/files/patch-base_system_sys__info__unittest.cc | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/devel/electron35/files/patch-base_system_sys__info__unittest.cc b/devel/electron35/files/patch-base_system_sys__info__unittest.cc deleted file mode 100644 index 4e356be04c2f..000000000000 --- a/devel/electron35/files/patch-base_system_sys__info__unittest.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- base/system/sys_info_unittest.cc.orig 2024-08-14 20:54:23 UTC -+++ base/system/sys_info_unittest.cc -@@ -265,12 +265,16 @@ TEST_F(SysInfoTest, GetHardwareInfo) { - EXPECT_TRUE(IsStringUTF8(hardware_info->model)); - bool empty_result_expected = - #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || \ -- BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || \ -+ BUILDFLAG(IS_BSD) - false; - #else - true; - #endif - EXPECT_EQ(hardware_info->manufacturer.empty(), empty_result_expected); -+#if BUILDFLAG(IS_BSD) -+ empty_result_expected = true; -+#endif - EXPECT_EQ(hardware_info->model.empty(), empty_result_expected); - } - |