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

Accepting request 591694 from science

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/591694
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/datamash?expand=0&rev=2
This commit is contained in:
Dominique Leuenberger 2018-03-30 10:07:30 +00:00 committed by Git OBS Bridge
commit aa33f6f813
4 changed files with 83 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
datamash.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Mar 23 08:43:03 UTC 2018 - guillaume.gardet@opensuse.org
- Disable broken test with upstream patch:
* upstream-disable-broken-test.patch
- Fix another test
* upstream-fix-test.patch
-------------------------------------------------------------------
Sat Mar 17 15:09:06 UTC 2018 - astieger@suse.com

10
datamash.spec
View File

@ -20,12 +20,16 @@ Name: datamash
Version: 1.3
Release: 0
Summary: Statistical, numerical and textual operations in the command line
License: GPL-3.0+
License: GPL-3.0-or-later
Group: Productivity/Scientific/Math
URL: https://www.gnu.org/software/datamash/
Url: https://www.gnu.org/software/datamash/
Source: https://ftp.gnu.org/gnu/datamash/%{name}-%{version}.tar.gz
Source2: https://ftp.gnu.org/gnu/datamash/%{name}-%{version}.tar.gz.sig
Source3: https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=datamash&download=1#/%{name}.keyring
# PTACH-FIX-UPSTREAM upstream-disable-broken-test.patch guillaume@opensuse.org -- Disable broken test (fix AArch64)
Patch0: upstream-disable-broken-test.patch
# PATCH-FIX-UPSTREAM upstream-fix-test.patch guillaume@opensuse.org -- Rework a test (fix armv7l and PPC64)
Patch1: upstream-fix-test.patch
BuildRequires: pkgconfig
BuildRequires: pkgconfig(openssl)
Requires(post): %{install_info_prereq}
@ -37,6 +41,8 @@ textual and statistical operations on input textual data files.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
%configure \

30
upstream-disable-broken-test.patch Normal file
View File

@ -0,0 +1,30 @@
From f4871963974a96d6e69cb80b9c2fac7ff0c1d472 Mon Sep 17 00:00:00 2001
From: Assaf Gordon <assafgordon@gmail.com>
Date: Thu, 22 Mar 2018 11:18:13 -0600
Subject: tests: disable --format="%a" test
Valid output can differ (e.g. 0x8.000p-3 vs 0x1.000p+0).
* tests/datamash-output-format.pl: Disable 'a1' test.
---
tests/datamash-output-format.pl | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tests/datamash-output-format.pl b/tests/datamash-output-format.pl
index ca99bb0..5e90ae0 100755
--- a/tests/datamash-output-format.pl
+++ b/tests/datamash-output-format.pl
@@ -90,7 +90,9 @@ my @Tests =
['e2', '--format "%.3e" sum 1', {IN_PIPE=>$in1}, {OUT=>"1.000e+00\n"}],
# Test Custom formats: %a
- ['a1', '--format "%0.3a" sum 1', {IN_PIPE=>$in1}, {OUT=>"0x8.000p-3\n"}],
+ # Disable the test for now. Valid output can differ (e.g. 0x8.000p-3 and
+ # 0x1.000p0 ).
+ # ['a1', '--format "%0.3a" sum 1', {IN_PIPE=>$in1}, {OUT=>"0x8.000p-3\n"}],
# Custom formats can use lots of memory
--
cgit v1.0-41-gc330

37
upstream-fix-test.patch Normal file
View File

@ -0,0 +1,37 @@
From d446dba317aa067440d6312d955d523129949327 Mon Sep 17 00:00:00 2001
From: Assaf Gordon <assafgordon@gmail.com>
Date: Thu, 22 Mar 2018 11:00:34 -0600
Subject: tests: fix --format='%4000f' expected output
Can be 1.000009... or 1.000008999, depending on representation.
* tests/datamash-output-format.pl: Check only the first 5 digits.
---
tests/datamash-output-format.pl | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/tests/datamash-output-format.pl b/tests/datamash-output-format.pl
index 52c68a2..ca99bb0 100755
--- a/tests/datamash-output-format.pl
+++ b/tests/datamash-output-format.pl
@@ -98,12 +98,13 @@ my @Tests =
{OUT => "0" x 3999 . "1\n"}],
# due to binary floating representation, some decimal point digits won't be
- # zero (e.g. 1.0000090000000000000000000000000523453254320000000...).
- # The OUT_SUBST replaces exactly 3994 digits (as expected from the format)
+ # zero (e.g. 1.0000090000000000000000000000000523453254320000000... or
+ # 1.000008999999...).
+ # The OUT_SUBST replaces exactly 3995 digits (as expected from the format)
# with an "X".
['m2', '--format "%.4000f" sum 1', {IN_PIPE=>$in1},
- {OUT => "1.000009X\n"},
- {OUT_SUBST => 's/^(1\.000009)([0-9]{3994})$/\1X/'}],
+ {OUT => "1.00000X\n"},
+ {OUT_SUBST => 's/^(1\.00000)([0-9]{3995})$/\1X/'}],
);
--
cgit v1.0-41-gc330