[OpenGTL/f15/master] build with -DOPENGTL_BUILD_TESTS=ON runtime tests fail/hang (#690516, kde#269172)

Rex Dieter rdieter at fedoraproject.org
Mon Mar 28 13:25:33 UTC 2011


commit 5d52162747684ebb048818e16b26915448dbf888
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Mar 28 08:27:59 2011 -0500

    build with -DOPENGTL_BUILD_TESTS=ON
    runtime tests fail/hang (#690516, kde#269172)

 OpenGTL.spec              |   18 ++++++++++++++++--
 opengtl-c6f1381966ff.diff |   20 ++++++++++++++++++++
 2 files changed, 36 insertions(+), 2 deletions(-)
---
diff --git a/OpenGTL.spec b/OpenGTL.spec
index 77cb3e8..650c7fa 100644
--- a/OpenGTL.spec
+++ b/OpenGTL.spec
@@ -3,7 +3,7 @@
 
 Name: OpenGTL
 Version: 0.9.15
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Graphics Transformation Languages
 License: LGPLv2
 Group: Development/Languages
@@ -15,6 +15,10 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 # http://llvm.org/bugs/show_bug.cgi?id=3729
 ExcludeArch: ppc64
 
+## upstream patches
+# http://bugs.kde.org/show_bug.cgi?id=269172
+Patch100: https://bitbucket.org/opengtl/opengtl/changeset/c6f1381966ff/raw/opengtl-c6f1381966ff.diff
+
 BuildRequires: cmake
 BuildRequires: doxygen graphviz
 BuildRequires: libpng-devel
@@ -51,11 +55,15 @@ native programs that use the OpenGTL libraries.
 %prep
 %setup -q
 
+%patch100 -p1 -b .kde269172
+
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake} ..
+%{cmake} \
+  -DOPENGTL_BUILD_TESTS:BOOL=ON \
+  ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -80,6 +88,8 @@ test "$(pkg-config --modversion GTLCore)" = "%{version}"
 test "$(pkg-config --modversion GTLImageIO)" = "%{version}"
 test "$(pkg-config --modversion OpenCTL)" = "%{version}"
 test "$(pkg-config --modversion OpenShiva)" = "%{version}"
+# some known failures due to missing test data (looking into it)
+make test -C  %{_target_platform} ||:
 
 
 %clean
@@ -135,6 +145,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Mar 24 2011 Rex Dieter <rdieter at fedoraproject.org> 0.9.15-3
+- build with -DOPENGTL_BUILD_TESTS=ON
+- runtime tests fail/hang (#690516, kde#269172)
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.15-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/opengtl-c6f1381966ff.diff b/opengtl-c6f1381966ff.diff
new file mode 100644
index 0000000..089daef
--- /dev/null
+++ b/opengtl-c6f1381966ff.diff
@@ -0,0 +1,20 @@
+# HG changeset patch -- Bitbucket.org
+# Project OpenGTL
+# URL https://bitbucket.org/opengtl/opengtl/overview
+# User Cyrille Berger <cberger at cberger.net>
+# Date 1301153654 -3600
+# Node ID c6f1381966ffde8051c055643fe302a319c5f08e
+# Parent  d3a59784c8c46aef90e05e626404cbf5a3f673c6
+Fix: some eofbot cases set the failbit instead of the eofbit... this fix inifinite loops in FC15
+
+--- a/OpenGTL/GTLCore/LexerBase_p.cpp
++++ b/OpenGTL/GTLCore/LexerBase_p.cpp
+@@ -81,7 +81,7 @@ void LexerBase::unget()
+ 
+ bool LexerBase::eof() const
+ {
+-  return d->stream->eof();
++  return d->stream->eof() or d->stream->fail() or d->stream->bad();
+ }
+ 
+ int LexerBase::line() const


More information about the scm-commits mailing list