* gnu/packages/patches/datamash-arm-tests.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/datamash.scm (datamash)[source]: Use it.
		
			
				
	
	
		
			71 lines
		
	
	
	
		
			2.5 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			71 lines
		
	
	
	
		
			2.5 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
See https://lists.gnu.org/archive/html/bug-datamash/2018-03/msg00003.html and
 | 
						|
https://lists.gnu.org/archive/html/bug-datamash/2018-03/txt4DmvR7p6J9.txt
 | 
						|
 | 
						|
From d446dba317aa067440d6312d955d523129949327 Mon Sep 17 00:00:00 2001
 | 
						|
From: Assaf Gordon <address@hidden>
 | 
						|
Date: Thu, 22 Mar 2018 11:00:34 -0600
 | 
						|
Subject: [PATCH 1/2] 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/'}],
 | 
						|
 
 | 
						|
 );
 | 
						|
 
 | 
						|
-- 
 | 
						|
2.7.4
 | 
						|
 | 
						|
 | 
						|
From f4871963974a96d6e69cb80b9c2fac7ff0c1d472 Mon Sep 17 00:00:00 2001
 | 
						|
From: Assaf Gordon <address@hidden>
 | 
						|
Date: Thu, 22 Mar 2018 11:18:13 -0600
 | 
						|
Subject: [PATCH 2/2] 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
 | 
						|
-- 
 | 
						|
2.7.4
 | 
						|
 |