pool/googletest
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 130677 from home:MargueriteSu:branches:M17N

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/130677
OBS-URL: https://build.opensuse.org/package/show/M17N/googletest?expand=0&rev=7
This commit is contained in:
Marguerite Su 2012-08-12 12:14:25 +00:00 committed by Git OBS Bridge
parent 539df9f72a
commit dfe5b3c363
3 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtest.changes
View File

@ -1,7 +1,7 @@
-------------------------------------------------------------------
Sun Aug 12 13:27:39 UTC 2012 - i@marguerite.su
- fix sles builds with shared libraries on.
- force sles build static libraries, else a lot of inner test can't build.
-------------------------------------------------------------------
Sun Aug 12 11:08:50 UTC 2012 - i@marguerite.su

11
gtest.spec
View File

@ -15,8 +15,11 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%if 0%{?sles_version}
%define build_shlib 0
%else
%define build_shlib 1
%endif
Name: gtest
Version: 1.6.0
@ -26,7 +29,6 @@ Summary: Google C++ Testing Framework
Url: http://code.google.com/p/googletest/
Group: Development/Libraries/C and C++
Source0: %{name}-%{version}.zip
Patch0: sles-gtest-unittest-hex-escape-sequence-out-of-range.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: python
@ -52,11 +54,6 @@ developing applications that use googletest.
%prep
%setup -q -n gtest-%{version}
%if 0%{?sles_version}
%if %build_shlib
%patch0 -p1
%endif
%endif
%build
mkdir build

20
sles-gtest-unittest-hex-escape-sequence-out-of-range.patch
View File

@ -1,20 +0,0 @@
diff -urN gtest-1.6.0.orig/test/gtest_unittest.cc gtest-1.6.0/test/gtest_unittest.cc
--- gtest-1.6.0.orig/test/gtest_unittest.cc 2012-08-12 21:20:38.020951647 +0800
+++ gtest-1.6.0/test/gtest_unittest.cc 2012-08-12 21:22:15.474733308 +0800
@@ -404,13 +404,13 @@
TEST(CodePointToUtf8Test, CanEncode17To21Bits) {
char buffer[32];
// 0 0001 0000 1000 1101 0011 => 11110-000 10-010000 10-100011 10-010011
- EXPECT_STREQ("\xF0\x90\xA3\x93", CodePointToUtf8(L'\x108D3', buffer));
+// EXPECT_STREQ("\xF0\x90\xA3\x93", CodePointToUtf8(L'\x108D3', buffer));
// 0 0001 0000 0100 0000 0000 => 11110-000 10-010000 10-010000 10-000000
- EXPECT_STREQ("\xF0\x90\x90\x80", CodePointToUtf8(L'\x10400', buffer));
+// EXPECT_STREQ("\xF0\x90\x90\x80", CodePointToUtf8(L'\x10400', buffer));
// 1 0000 1000 0110 0011 0100 => 11110-100 10-001000 10-011000 10-110100
- EXPECT_STREQ("\xF4\x88\x98\xB4", CodePointToUtf8(L'\x108634', buffer));
+// EXPECT_STREQ("\xF4\x88\x98\xB4", CodePointToUtf8(L'\x108634', buffer));
}
// Tests that encoding an invalid code-point generates the expected result.