PATCH: add support for minix
CvR
The attached patch adds support for the Minix 3 operating system
(www.minix3.org). It #defines GTEST_OS_MINIX if compiled on a Minix
system, and uses that macro to fix two Minix 3 issues.
These patches were originally against the llvm variant of google test,
but I was asked there to submit them here.
Index: include/gtest/internal/gtest-port.h
===================================================================
--- include/gtest/internal/gtest-port.h (revision 443)
+++ include/gtest/internal/gtest-port.h (working copy)
@@ -219,10 +219,12 @@
#define GTEST_OS_SOLARIS 1
#elif defined(_AIX)
#define GTEST_OS_AIX 1
+#elif defined(__minix)
+#define GTEST_OS_MINIX 1
#endif // __CYGWIN__
#if GTEST_OS_CYGWIN || GTEST_OS_LINUX || GTEST_OS_MAC ||
GTEST_OS_SYMBIAN || \
- GTEST_OS_SOLARIS || GTEST_OS_AIX
+ GTEST_OS_SOLARIS || GTEST_OS_AIX || GTEST_OS_MINIX
// On some platforms, <regex.h> needs someone to define size_t, and
// won't compile otherwise. We can #include it here as we already
@@ -311,7 +313,9 @@
// Cygwin 1.5 and below doesn't support ::std::wstring.
// Cygwin 1.7 might add wstring support; this should be updated when
clear.
// Solaris' libc++ doesn't support it either.
-#define GTEST_HAS_STD_WSTRING (!(GTEST_OS_CYGWIN ||
GTEST_OS_SOLARIS))
+// Minix currently doesn't support it either.
+#define GTEST_HAS_STD_WSTRING (!(GTEST_OS_CYGWIN || GTEST_OS_SOLARIS
\
+ || GTEST_OS_MINIX))
#endif // GTEST_HAS_STD_WSTRING
--
Kees
Zhanyong Wan (λx.x x)
Would you mind signing a Contributor License Agreement s.t. we can use
this patch?
The instructions are at
http://code.google.com/p/googletest/wiki/GoogleTestDevGuide#Contributor_License_Agreements
- thanks!
--
Zhanyong
Vlad Losev
Kees van Reeuwijk
On 13 Jul 2010, at 00:27, Vlad Losev wrote:
> Actually, we had a number of similar OS support patches recently. Each one consists of little more than sniffing the OS and then enabling or disabling certain gtest features based on it. IMO, instead of providing cases for all those OSes we need a more general feature-based approach.
>
> In particular for Minix/Haiku we need to create the explicit feature for POSIX regex support (GTEST_HAS_POSIX_RE), make it user-overridable, and publish it.
>
> With this change users will be able to build gtest on OSes such as Haiku and Minix by setting CPPFLAGS="-DGTEST_HAS_POSIX_RE=1 -DGTEST_HAS_STD_WSTRING=0" in their environment or command line. In the future, even that can be automated with appropriate changes to the CMake/Autoconf build scripts.
I would vastly prefer that solution, if only because that way I wouldn't have to sign a license agreement just to add three lines of code to your repository. :-)
A better reason is that things change: Minix may well get good enough support for wstring in the near future, and that POSIX_RE thing may also be easily solvable.
--
Dr. Ir. Kees van Reeuwijk, Vrije Universiteit Amsterdam
Vlad Losev
--
Dr. Ir. Kees van Reeuwijk, Vrije Universiteit Amsterdam