From bf8a6d9be819273900fa234c4a6a67b5641ce51b Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Fri, 29 Apr 2011 13:30:08 +0300
Subject: [PATCH] - Comment out stupid oserror tests which depend on system
 settings   on max permitted open files per user: on koji these tests "fail"  
 because sqlite can open more files than a the hardcoded limit of 2000   in
 the tests expect, so it never sees the errors it thinks 2000   open files
 should cause. Doh.

---
 sqlite-3.7.6-stupid-openfiles-test.patch | 34 ++++++++++++++++++++++++
 sqlite.spec                              |  8 +++++-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 sqlite-3.7.6-stupid-openfiles-test.patch

diff --git a/sqlite-3.7.6-stupid-openfiles-test.patch b/sqlite-3.7.6-stupid-openfiles-test.patch
new file mode 100644
index 0000000..7325eb1
--- /dev/null
+++ b/sqlite-3.7.6-stupid-openfiles-test.patch
@@ -0,0 +1,34 @@
+diff -up sqlite-src-3070602/test/oserror.test.openfiles sqlite-src-3070602/test/oserror.test
+--- sqlite-src-3070602/test/oserror.test.openfiles	2011-04-29 13:23:00.000000000 +0300
++++ sqlite-src-3070602/test/oserror.test	2011-04-29 13:24:26.000000000 +0300
+@@ -51,18 +51,18 @@ proc do_re_test {tn script expression} {
+ # a call to getcwd() may fail if there are no free file descriptors. So
+ # an error may be reported for either open() or getcwd() here.
+ #
+-do_test 1.1.1 {
+-  set ::log [list]
+-  list [catch {
+-    for {set i 0} {$i < 2000} {incr i} { sqlite3 dbh_$i test.db -readonly 1 }
+-  } msg] $msg
+-} {1 {unable to open database file}}
+-do_test 1.1.2 {
+-  catch { for {set i 0} {$i < 2000} {incr i} { dbh_$i close } }
+-} {1}
+-do_re_test 1.1.3 { 
+-  lindex $::log 0 
+-} {^os_unix.c:\d+: \(\d+\) (open|getcwd)\(.*test.db\) - }
++#do_test 1.1.1 {
++#  set ::log [list]
++#  list [catch {
++#    for {set i 0} {$i < 2000} {incr i} { sqlite3 dbh_$i test.db -readonly 1 }
++#  } msg] $msg
++#} {1 {unable to open database file}}
++#do_test 1.1.2 {
++#  catch { for {set i 0} {$i < 2000} {incr i} { dbh_$i close } }
++#} {1}
++#do_re_test 1.1.3 { 
++#  lindex $::log 0 
++#} {^os_unix.c:\d+: \(\d+\) (open|getcwd)\(.*test.db\) - }
+ 
+ 
+ # Test a failure in open() due to the path being a directory.
diff --git a/sqlite.spec b/sqlite.spec
index 64c4bc8..37e0ee0 100644
--- a/sqlite.spec
+++ b/sqlite.spec
@@ -10,7 +10,7 @@
 Summary: Library that implements an embeddable SQL database engine
 Name: sqlite
 Version: %{rpmver}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: Applications/Databases
 URL: http://www.sqlite.org/
@@ -22,6 +22,8 @@ Patch1: sqlite-3.6.12-libdl.patch
 Patch2: sqlite-3.6.23-lemon-system-template.patch
 # Fixup test-suite expectations wrt SQLITE_DISABLE_DIRSYNC 
 Patch3: sqlite-3.7.4-wal2-nodirsync.patch
+# Shut up stupid tests depending on system settings of allowed open fd's
+Patch4: sqlite-3.7.6-stupid-openfiles-test.patch
 BuildRequires: ncurses-devel readline-devel glibc-devel
 # libdl patch needs
 BuildRequires: autoconf
@@ -94,6 +96,7 @@ This package contains the tcl modules for %{name}.
 %patch1 -p1 -b .libdl
 %patch2 -p1 -b .lemon-system-template
 %patch3 -p1 -b .wal2-nodirsync
+%patch4 -p1 -b .stupid-openfiles-test
 
 # Remove cgi-script erroneously included in sqlite-doc-3070500
 rm -f %{name}-doc-%{realver}/search
@@ -180,6 +183,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Apr 29 2011 Panu Matilainen <pmatilai@redhat.com> - 3.7.6.2-2
+- comment out stupid tests causing very bogus build failure on koji
+
 * Thu Apr 21 2011 Panu Matilainen <pmatilai@redhat.com> - 3.7.6.2-1
 - update to 3.7.6.2 (http://www.sqlite.org/releaselog/3_7_6_2.html)