Your message dated Wed, 03 Nov 2021 15:18:59 +0000
with message-id <[email protected]>
and subject line Bug#995574: fixed in googletest 1.11.0-3
has caused the Debian Bug report #995574,
regarding googletest: please support GNU/Hurd
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
995574: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=995574
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: googletest
Version: 1.11.0-2
Severity: important
Tags: upstream patch fixed-upstream
User: [email protected]
Usertags: hurd
Control: forwarded -1 https://github.com/google/googletest/pull/3200
Hi,
a couple of months ago, thanks to the effort of Mattias Ellert,
GoogleTest got support for GNU/Hurd [1], merged as commit
05e9fa23f7 [2].
Can you please backport it to the Debian package? This way, all the
sources that use GoogleTest from the system will benefit from it.
Attached there is a git format-patch version of the commit, which
applies almost cleanly (only with offsets in one file).
[1] https://github.com/google/googletest/pull/3200
[2]
https://github.com/google/googletest/commit/05e9fa23f74a4766294f858c16e87a1560261340
Thanks,
--
Pino
>From 05e9fa23f74a4766294f858c16e87a1560261340 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <[email protected]>
Date: Wed, 30 Dec 2020 13:50:04 +0100
Subject: [PATCH] Port to GNU/Hurd
---
googletest/include/gtest/internal/gtest-port-arch.h | 2 ++
googletest/include/gtest/internal/gtest-port.h | 9 ++++++---
googletest/src/gtest-port.cc | 2 +-
googletest/test/googletest-port-test.cc | 2 +-
googletest/test/gtest_help_test.py | 3 ++-
5 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/googletest/include/gtest/internal/gtest-port-arch.h
b/googletest/include/gtest/internal/gtest-port-arch.h
index 813bf2c6..a75cd5bb 100644
--- a/googletest/include/gtest/internal/gtest-port-arch.h
+++ b/googletest/include/gtest/internal/gtest-port-arch.h
@@ -78,6 +78,8 @@
# define GTEST_OS_FREEBSD 1
#elif defined __Fuchsia__
# define GTEST_OS_FUCHSIA 1
+#elif defined(__GNU__)
+# define GTEST_OS_GNU_HURD 1
#elif defined(__GLIBC__) && defined(__FreeBSD_kernel__)
# define GTEST_OS_GNU_KFREEBSD 1
#elif defined __linux__
diff --git a/googletest/include/gtest/internal/gtest-port.h
b/googletest/include/gtest/internal/gtest-port.h
index 6b66362f..f62f5876 100644
--- a/googletest/include/gtest/internal/gtest-port.h
+++ b/googletest/include/gtest/internal/gtest-port.h
@@ -116,6 +116,7 @@
// GTEST_OS_DRAGONFLY - DragonFlyBSD
// GTEST_OS_FREEBSD - FreeBSD
// GTEST_OS_FUCHSIA - Fuchsia
+// GTEST_OS_GNU_HURD - GNU/Hurd
// GTEST_OS_GNU_KFREEBSD - GNU/kFreeBSD
// GTEST_OS_HAIKU - Haiku
// GTEST_OS_HPUX - HP-UX
@@ -543,7 +544,7 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
(GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_HPUX || GTEST_OS_QNX ||
\
GTEST_OS_FREEBSD || GTEST_OS_NACL || GTEST_OS_NETBSD || GTEST_OS_FUCHSIA ||
\
GTEST_OS_DRAGONFLY || GTEST_OS_GNU_KFREEBSD || GTEST_OS_OPENBSD ||
\
- GTEST_OS_HAIKU)
+ GTEST_OS_HAIKU || GTEST_OS_GNU_HURD)
#endif // GTEST_HAS_PTHREAD
#if GTEST_HAS_PTHREAD
@@ -603,7 +604,8 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
(GTEST_OS_WINDOWS_DESKTOP && _MSC_VER) || GTEST_OS_WINDOWS_MINGW || \
GTEST_OS_AIX || GTEST_OS_HPUX || GTEST_OS_OPENBSD || GTEST_OS_QNX || \
GTEST_OS_FREEBSD || GTEST_OS_NETBSD || GTEST_OS_FUCHSIA || \
- GTEST_OS_DRAGONFLY || GTEST_OS_GNU_KFREEBSD || GTEST_OS_HAIKU)
+ GTEST_OS_DRAGONFLY || GTEST_OS_GNU_KFREEBSD || GTEST_OS_HAIKU || \
+ GTEST_OS_GNU_HURD)
# define GTEST_HAS_DEATH_TEST 1
#endif
@@ -623,7 +625,8 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
// Determines whether test results can be streamed to a socket.
#if GTEST_OS_LINUX || GTEST_OS_GNU_KFREEBSD || GTEST_OS_DRAGONFLY || \
- GTEST_OS_FREEBSD || GTEST_OS_NETBSD || GTEST_OS_OPENBSD
+ GTEST_OS_FREEBSD || GTEST_OS_NETBSD || GTEST_OS_OPENBSD || \
+ GTEST_OS_GNU_HURD
# define GTEST_CAN_STREAM_RESULTS_ 1
#endif
diff --git a/googletest/src/gtest-port.cc b/googletest/src/gtest-port.cc
index 3f39f71c..989c59ae 100644
--- a/googletest/src/gtest-port.cc
+++ b/googletest/src/gtest-port.cc
@@ -98,7 +98,7 @@ const int kStdOutFileno = STDOUT_FILENO;
const int kStdErrFileno = STDERR_FILENO;
#endif // _MSC_VER
-#if GTEST_OS_LINUX
+#if GTEST_OS_LINUX || GTEST_OS_GNU_HURD
namespace {
template <typename T>
diff --git a/googletest/test/googletest-port-test.cc
b/googletest/test/googletest-port-test.cc
index 4a87df0b..e3ad4dde 100644
--- a/googletest/test/googletest-port-test.cc
+++ b/googletest/test/googletest-port-test.cc
@@ -280,7 +280,7 @@ TEST(FormatCompilerIndependentFileLocationTest,
FormatsUknownFileAndLine) {
#if GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_QNX || GTEST_OS_FUCHSIA || \
GTEST_OS_DRAGONFLY || GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD || \
- GTEST_OS_NETBSD || GTEST_OS_OPENBSD
+ GTEST_OS_NETBSD || GTEST_OS_OPENBSD || GTEST_OS_GNU_HURD
void* ThreadFunc(void* data) {
internal::Mutex* mutex = static_cast<internal::Mutex*>(data);
mutex->Lock();
diff --git a/googletest/test/gtest_help_test.py
b/googletest/test/gtest_help_test.py
index 8d953bbd..54d45047 100755
--- a/googletest/test/gtest_help_test.py
+++ b/googletest/test/gtest_help_test.py
@@ -43,6 +43,7 @@ import gtest_test_utils
IS_LINUX = os.name == 'posix' and os.uname()[0] == 'Linux'
+IS_GNUHURD = os.name == 'posix' and os.uname()[0] == 'GNU'
IS_GNUKFREEBSD = os.name == 'posix' and os.uname()[0] == 'GNU/kFreeBSD'
IS_WINDOWS = os.name == 'nt'
@@ -112,7 +113,7 @@ class GTestHelpTest(gtest_test_utils.TestCase):
self.assertEquals(0, exit_code)
self.assert_(HELP_REGEX.search(output), output)
- if IS_LINUX or IS_GNUKFREEBSD:
+ if IS_LINUX or IS_GNUHURD or IS_GNUKFREEBSD:
self.assert_(STREAM_RESULT_TO_FLAG in output, output)
else:
self.assert_(STREAM_RESULT_TO_FLAG not in output, output)
--
2.33.0
--- End Message ---
--- Begin Message ---
Source: googletest
Source-Version: 1.11.0-3
Done: Mattias Ellert <[email protected]>
We believe that the bug you reported is fixed in the latest version of
googletest, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Mattias Ellert <[email protected]> (supplier of updated googletest
package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Mon, 01 Nov 2021 14:41:45 +0100
Source: googletest
Architecture: source
Version: 1.11.0-3
Distribution: unstable
Urgency: medium
Maintainer: Steve M. Robbins <[email protected]>
Changed-By: Mattias Ellert <[email protected]>
Closes: 995574
Changes:
googletest (1.11.0-3) unstable; urgency=medium
.
[ Steve Robbins ]
* [25eda6d] New patch for GNU Hurd. Closes: #995574.
.
[ Mattias Ellert ]
* [4c70598] Exclude test gmock-matchers_test also on sh4
Checksums-Sha1:
00cb7c21306212803491a64933ed83c8e92e5f3b 2212 googletest_1.11.0-3.dsc
f97008c51b67cbd7b1828fc899ceea5e77e5140c 13488
googletest_1.11.0-3.debian.tar.xz
fe22c4852766a02e84c5ca6e26454d0b074d00c6 6656
googletest_1.11.0-3_source.buildinfo
Checksums-Sha256:
d7a122eb82167b6219bd85d0ea3a0cf472fd32accd05ced0457a411513060749 2212
googletest_1.11.0-3.dsc
8889ec225a7d4a4ca7b38b03aa792f0548b31ef04a0cd0c0c6aaa64392d20d0f 13488
googletest_1.11.0-3.debian.tar.xz
07494aba83d33aaf5f147eea21fb373896ac392b8a7e614dbc03764cf0929d59 6656
googletest_1.11.0-3_source.buildinfo
Files:
0507337afaa6d56c2a1e1ada79e55dd3 2212 devel optional googletest_1.11.0-3.dsc
f772ecd6f412650d2128cb05a45ee0db 13488 devel optional
googletest_1.11.0-3.debian.tar.xz
0dbea56a98cb4c9310ea66a5c3c29c46 6656 devel optional
googletest_1.11.0-3_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQJRBAEBCgA7FiEE6hgwr99NQxrZ4RRS6K7C/zvhqUsFAmGADo0dHG1hdHRpYXMu
ZWxsZXJ0QHBoeXNpY3MudXUuc2UACgkQ6K7C/zvhqUtjDBAAlHf0NZpXELlyeC5/
bGu0ShhG0gUOu1q5rgaCV/D+9kcnvf5nF8XmRLrjL4HjyQRWuPvAF3/Byc3Y2AT0
Z6L2Z0aTEriO+Ivn6+f6FiNvgiEVtBHcEXTxzNWGFUQqbadaGGTjyZwcAqHgEKx6
JIEeEDqIytKILhD4BUiieIDj2KtRcyoFTodaNIp6kB5j2RE9HVpWZkWvBkaebPeO
SASGAKDb85qO1jcGN38j7C05DgfXZUoe/ukdNUOgpWtgv4smHy0vWBf3JcFsNtNR
uwPJjIEaxQg4izcPFbCMuX95EmqC5M2WgONeQ1oq/Yw+1dh2l/0vWGnwhnnBoutp
RxDZPgRNsap4IxVGj2FPMFM1buGE4gGbDYlDBV/v+NGXlJCAhF5Abv9MOGJUeOiC
6Ai8NaNWl4wcaNJrCtWDK+bCuYTUaJUbJ2PoGyxa9jUnmZrpEkf6MMCUKp1Ch6jO
c7ZQ9Lu2i55uhZJv/NTUYKbmrCZ+M7ICpdfiBUvBVPKcdDqH3Zd77XvvYpgJ2I0s
VQvQ1G/HMY/WpZ25/sCEnB6ZJFK1keuWn6+B05PSzmSCzqGOVOTpxgq/lSymt0IC
F/2IaiYvg5oEzPrv7rUUk1vaa7EihMGoLL6QsOxwgneAa5sngp0bg8SYLH7kLja2
Ki2xLGsWFkLQlShlpEJBqIUzv7g=
=7VXZ
-----END PGP SIGNATURE-----
--- End Message ---
