rpms/gtest
7
0
Fork 0
Code Issues Pull Requests Releases Activity

add patch from Dan Horák to let 'make check' work

Browse Source
This commit is contained in:
Terje Rsten 2011-03-20 15:54:15 +01:00
parent 55f9f203e1
commit e30424b9bd
2 changed files with 50 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
gtest-1.5.0-make-check.patch Normal file
View File

@ -0,0 +1,38 @@
--- gtest-1.5.0/Makefile.am 2011-03-19 10:54:43.000000000 +0100
+++ gtest-1.5.0/Makefile.am 2011-03-19 10:58:37.000000000 +0100
@@ -234,6 +234,7 @@ TESTS += samples/sample1_unittest
check_PROGRAMS += samples/sample1_unittest
samples_sample1_unittest_SOURCES = samples/sample1_unittest.cc
samples_sample1_unittest_LDADD = lib/libgtest_main.la \
+ lib/libgtest.la \
samples/libsamples.la
# Another sample. It also verifies that libgtest works.
@@ -247,7 +248,8 @@ samples_sample10_unittest_LDADD = lib/li
TESTS += test/gtest_all_test
check_PROGRAMS += test/gtest_all_test
test_gtest_all_test_SOURCES = test/gtest_all_test.cc
-test_gtest_all_test_LDADD = lib/libgtest_main.la
+test_gtest_all_test_LDADD = lib/libgtest_main.la \
+ lib/libgtest.la
# Tests that fused gtest files compile and work.
FUSED_GTEST_SRC = \
--- gtest-1.5.0/Makefile.in 2011-03-19 10:54:49.000000000 +0100
+++ gtest-1.5.0/Makefile.in 2011-03-19 10:58:53.000000000 +0100
@@ -444,12 +444,14 @@ TESTS_ENVIRONMENT = GTEST_SOURCE_DIR="$(
samples_sample1_unittest_SOURCES = samples/sample1_unittest.cc
samples_sample1_unittest_LDADD = lib/libgtest_main.la \
+ lib/libgtest.la \
samples/libsamples.la
samples_sample10_unittest_SOURCES = samples/sample10_unittest.cc
samples_sample10_unittest_LDADD = lib/libgtest.la
test_gtest_all_test_SOURCES = test/gtest_all_test.cc
-test_gtest_all_test_LDADD = lib/libgtest_main.la
+test_gtest_all_test_LDADD = lib/libgtest_main.la \
+ lib/libgtest.la
# Tests that fused gtest files compile and work.
FUSED_GTEST_SRC = \

22
gtest.spec
View File

@ -1,11 +1,12 @@
Summary: Google C++ testing framework
Name: gtest
Version: 1.5.0
Release: 3%{?dist}
Release: 4%{?dist}
License: BSD
Group: Development/Tools
URL: http://code.google.com/p/googletest/
Source0: http://googletest.googlecode.com/files/gtest-%{version}.tar.bz2
Patch0: gtest-1.5.0-make-check.patch
BuildRequires: python
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@ -18,16 +19,17 @@ failures, various options for running the tests, and XML test report
generation.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: automake
Requires: %{name} = %{version}-%{release}
Summary: Development files for %{name}
Group: Development/Libraries
Requires: automake
Requires: %{name} = %{version}-%{release}
%description devel
This package contains development files for %{name}.
%prep
%setup -q
%patch0 -p1
# keep a clean copy of samples.
cp -pr ./samples ./samples.orig
@ -42,10 +44,7 @@ sed -i -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}
%check
# Two tests fail here, unclear as to why.
# Some extra magic, however still fails...
export LD_LIBRARY_PATH=$(pwd)/lib/.libs
make check AM_LDFLAGS='-Wl,--add-needed' LDFLAGS='lib/.libs/libgtest.so' || :
make check
# Restore the clean copy of samples.
# To be later listed against doc.
@ -80,11 +79,14 @@ rm -rf %{buildroot}
%{_includedir}/gtest
%changelog
* Sun Mar 20 2011 Terje Rosten <terje.rosten@ntnu.no> - 1.5.0-4
- add patch from Dan Horák to let 'make check' work
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Sun Jan 16 2011 Terje Rosten <terje.rosten@ntnu.no> - 1.5.0-2
- Add python to buildreq
- add python to buildreq
* Wed Jan 12 2011 Terje Rosten <terje.rosten@ntnu.no> - 1.5.0-1
- 1.5.0