From 0fbc6f8a4aa025828a0b7844b9445a15f8cf9828 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Mon, 25 Apr 2016 13:30:06 +0200 Subject: [PATCH] FTBFS: well, disable the test on armv7hl completely.. Related: rhbz#1330031 Version: 09.05.0210-1 --- postgresql-odbc-09.05.0210-tests-arm.patch | 28 +++++++++++++++++ postgresql-odbc-tests-arm.patch | 35 ---------------------- postgresql-odbc.spec | 16 ++++++---- 3 files changed, 38 insertions(+), 41 deletions(-) create mode 100644 postgresql-odbc-09.05.0210-tests-arm.patch delete mode 100644 postgresql-odbc-tests-arm.patch diff --git a/postgresql-odbc-09.05.0210-tests-arm.patch b/postgresql-odbc-09.05.0210-tests-arm.patch new file mode 100644 index 0000000..2cb4b11 --- /dev/null +++ b/postgresql-odbc-09.05.0210-tests-arm.patch @@ -0,0 +1,28 @@ +From 75cf55112bae7c0d71edafe551a66b799882d739 Mon Sep 17 00:00:00 2001 +From: Pavel Raiskup +Date: Mon, 2 May 2016 08:14:43 +0200 +Subject: [PATCH] Disable the test only on arm for now + +This has been reported upstream: +http://www.postgresql.org/message-id/1891019.xN52Kdy8p1@nb.usersys.redhat.com + +Related: rhbz#1330031 +--- + test/tests | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/test/tests b/test/tests +index a699d5d..1909983 100644 +--- a/test/tests ++++ b/test/tests +@@ -36,7 +36,6 @@ TESTBINS = src/connect-test \ + src/cursor-name-test \ + src/bookmark-test \ + src/declare-fetch-commit-test \ +- src/declare-fetch-block-test \ + src/positioned-update-test \ + src/bulkoperations-test \ + src/catalogfunctions-test \ +-- +2.5.5 + diff --git a/postgresql-odbc-tests-arm.patch b/postgresql-odbc-tests-arm.patch deleted file mode 100644 index 7921181..0000000 --- a/postgresql-odbc-tests-arm.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 0953b4fa77a1d3b1a905111771da9d994a5a0b5b Mon Sep 17 00:00:00 2001 -From: Pavel Raiskup -Date: Mon, 25 Apr 2016 12:24:31 +0200 -Subject: [PATCH] Hack the expected file only for arm - -This has been reported upstream: -http://www.postgresql.org/message-id/1891019.xN52Kdy8p1@nb.usersys.redhat.com - -Related: rhbz#1330031 ---- - test/expected/declare-fetch-block.out | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/test/expected/declare-fetch-block.out b/test/expected/declare-fetch-block.out -index 2368b59..2f60b3b 100644 ---- a/test/expected/declare-fetch-block.out -+++ b/test/expected/declare-fetch-block.out -@@ -2,9 +2,9 @@ connected - fetchIdx=1, fetched rows=84, total rows=84 - fetchIdx=2, fetched rows=36, total rows=120 - next total rows=120 --prior total rows=120 --next total rows=120 --prior total rows=120 -+prior total rows=20 -+next total rows=0 -+prior total rows=0 - FetchScroll beyond the end failed 100 --encountered EOF at 120 --disconnecting -+FetchScroll the 1st row failed -+No error information --- -2.5.5 - diff --git a/postgresql-odbc.spec b/postgresql-odbc.spec index b58d9ac..81a431e 100644 --- a/postgresql-odbc.spec +++ b/postgresql-odbc.spec @@ -10,10 +10,9 @@ Source0: http://ftp.postgresql.org/pub/odbc/versions/src/psqlodbc-%{version}.tar Source1: postgres-testing.sh +Source2: postgresql-odbc-09.05.0210-tests-arm.patch + Patch0: postgresql-odbc-09.05.0210-revert-money-fix.patch -%ifarch armv7hl -Patch1: postgresql-odbc-tests-arm.patch -%endif BuildRequires: unixODBC-devel postgresql-devel BuildRequires: postgresql-server @@ -28,6 +27,11 @@ PostgreSQL system via ODBC (Open Database Connectivity). %prep %autosetup -p1 -n psqlodbc-%{version} + +%ifarch armv7hl +cat %{SOURCE2} | patch -p1 +%endif + cat <README.rpmdist The upstream psqlodbc testsuite is distributed in '%{name}-tests' (sub)package. @@ -61,7 +65,7 @@ pgtests_start cd test && make installcheck || { echo "=== trying to find all regression.diffs files in build directory ===" - find -name 'regression.diffs' | while read line; do + find -name regression.diffs | while read line; do cat "$line" done false @@ -100,11 +104,11 @@ the PostgreSQL unixODBC driver. %changelog -* Mon Apr 18 2016 Pavel Raiskup - 09.05.0210-1 +* Mon May 02 2016 Pavel Raiskup - 09.05.0210-1 - rebase to latest upstream version, per release notes: https://odbc.postgresql.org/docs/release.html - revert one upstream commit to fix testsuite issues -- workaround one armv7hl related issue during self-testing (rhbz#1330031) +- disable one armv7hl related issue during self-testing (rhbz#1330031) * Thu Apr 14 2016 Pavel Raiskup - 09.05.0200-2 - enable testsuite during build