mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-03-13 09:31:57 +01:00
977b9574eb
- bump from 1.6.0 to 2.0.1 - remove cargo patch - add patch for tests on 32bit architecture, see: https://github.com/01mf02/jaq/issues/243 - package MIT license
92 lines
3.7 KiB
Diff
92 lines
3.7 KiB
Diff
Patch-Source: https://github.com/01mf02/jaq/commit/18aa0a8ac81b8321a453680fecf03b78961fd7ce
|
|
From 18aa0a8ac81b8321a453680fecf03b78961fd7ce Mon Sep 17 00:00:00 2001
|
|
From: Simon Rupf <simon@rupf.net>
|
|
Date: Mon, 9 Dec 2024 19:08:43 +0100
|
|
Subject: [PATCH] Changing test to pass on 32 bit architecture.
|
|
|
|
Reduces large isize to remain below maximum for signed 32 bit int,
|
|
resolves #243
|
|
---
|
|
jaq-json/tests/funs.rs | 28 ++++++++++++++--------------
|
|
1 file changed, 14 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/jaq-json/tests/funs.rs b/jaq-json/tests/funs.rs
|
|
index 7aecdbe..d68ce55 100644
|
|
--- a/jaq-json/tests/funs.rs
|
|
+++ b/jaq-json/tests/funs.rs
|
|
@@ -81,7 +81,7 @@ fn tojson() {
|
|
#[test]
|
|
fn math_rem() {
|
|
// generated with this command with modification for errors and float rounding
|
|
- // cargo run -- -rn 'def f: -2, -1, 0, 2.1, 3, 4000000001; f as $a | f as $b | "give!(json!(null), \"\($a) / \($b)\", \(try ($a % $b) catch tojson));"'
|
|
+ // cargo run -- -rn 'def f: -2, -1, 0, 2.1, 3, 2000000001; f as $a | f as $b | "give!(json!(null), \"\($a) / \($b)\", \(try ($a % $b) catch tojson));"'
|
|
// TODO: use fail!()?
|
|
give(json!(null), "-2 % -2", json!(0));
|
|
give(json!(null), "-2 % -1", json!(0));
|
|
@@ -92,7 +92,7 @@ fn math_rem() {
|
|
);
|
|
give(json!(null), "-2 % 2.1", json!(-2.0));
|
|
give(json!(null), "-2 % 3", json!(-2));
|
|
- give(json!(null), "-2 % 4000000001", json!(-2));
|
|
+ give(json!(null), "-2 % 2000000001", json!(-2));
|
|
give(json!(null), "-1 % -2", json!(-1));
|
|
give(json!(null), "-1 % -1", json!(0));
|
|
give(
|
|
@@ -102,7 +102,7 @@ fn math_rem() {
|
|
);
|
|
give(json!(null), "-1 % 2.1", json!(-1.0));
|
|
give(json!(null), "-1 % 3", json!(-1));
|
|
- give(json!(null), "-1 % 4000000001", json!(-1));
|
|
+ give(json!(null), "-1 % 2000000001", json!(-1));
|
|
give(json!(null), "0 % -2", json!(0));
|
|
give(json!(null), "0 % -1", json!(0));
|
|
give(
|
|
@@ -112,13 +112,13 @@ fn math_rem() {
|
|
);
|
|
give(json!(null), "0 % 2.1", json!(0.0));
|
|
give(json!(null), "0 % 3", json!(0));
|
|
- give(json!(null), "0 % 4000000001", json!(0));
|
|
+ give(json!(null), "0 % 2000000001", json!(0));
|
|
give(json!(null), "2.1 % -2 | . * 1000 | round", json!(100));
|
|
give(json!(null), "2.1 % -1 | . * 1000 | round", json!(100));
|
|
give(json!(null), "2.1 % 0 | isnan", json!(true));
|
|
give(json!(null), "2.1 % 2.1", json!(0.0));
|
|
give(json!(null), "2.1 % 3", json!(2.1));
|
|
- give(json!(null), "2.1 % 4000000001", json!(2.1));
|
|
+ give(json!(null), "2.1 % 2000000001", json!(2.1));
|
|
give(json!(null), "3 % -2", json!(1));
|
|
give(json!(null), "3 % -1", json!(0));
|
|
give(
|
|
@@ -128,19 +128,19 @@ fn math_rem() {
|
|
);
|
|
give(json!(null), "3 % 2.1 | . * 1000 | round", json!(900));
|
|
give(json!(null), "3 % 3", json!(0));
|
|
- give(json!(null), "3 % 4000000001", json!(3));
|
|
- give(json!(null), "4000000001 % -2", json!(1));
|
|
- give(json!(null), "4000000001 % -1", json!(0));
|
|
+ give(json!(null), "3 % 2000000001", json!(3));
|
|
+ give(json!(null), "2000000001 % -2", json!(1));
|
|
+ give(json!(null), "2000000001 % -1", json!(0));
|
|
give(
|
|
json!(null),
|
|
- "try (4000000001 % 0) catch .",
|
|
- json!("cannot calculate 4000000001 % 0"),
|
|
+ "try (2000000001 % 0) catch .",
|
|
+ json!("cannot calculate 2000000001 % 0"),
|
|
);
|
|
give(
|
|
json!(null),
|
|
- "4000000001 % 2.1 | . * 1000 | round",
|
|
- json!(500),
|
|
+ "2000000001 % 2.1 | . * 1000 | round",
|
|
+ json!(1800), // 1000 in jq
|
|
);
|
|
- give(json!(null), "4000000001 % 3", json!(2));
|
|
- give(json!(null), "4000000001 % 4000000001", json!(0));
|
|
+ give(json!(null), "2000000001 % 3", json!(0));
|
|
+ give(json!(null), "2000000001 % 2000000001", json!(0));
|
|
}
|
|
--
|
|
2.47.1
|
|
|