Add upstream patches to fix numeric range issues.

This commit is contained in:
Jerry James 2020-12-02 15:07:43 -07:00
parent ba868ff309
commit f573c54849
3 changed files with 70 additions and 2 deletions

View File

@ -0,0 +1,36 @@
From 99a5f108681271f50f31fe3988db0f94b5779c2b Mon Sep 17 00:00:00 2001
From: Jan Midtgaard <jmid@mmmi.sdu.dk>
Date: Thu, 12 Nov 2020 12:43:23 +0100
Subject: [PATCH 1/2] Fixes distribution and min_int issues
---
src/core/QCheck.ml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/core/QCheck.ml b/src/core/QCheck.ml
index 5a3a3e6..67d6e3a 100644
--- a/src/core/QCheck.ml
+++ b/src/core/QCheck.ml
@@ -162,7 +162,7 @@ module Gen = struct
else fun st -> let r = pint st in r mod (n + 1)
let int_range a b =
if b < a then invalid_arg "Gen.int_range";
- if a >= 0 || b <= 0 then (
+ if a >= 0 || b < 0 then (
(* range smaller than max_int *)
assert (b-a >= 0);
fun st -> a + (int_bound (b-a) st)
@@ -171,8 +171,8 @@ module Gen = struct
choose the itv wrt to their size ratio *)
fun st ->
let f_a = float_of_int a in
- let ratio = (-.f_a) /. (float_of_int b -. f_a) in
- if Random.float 1. < ratio then - (int_bound (abs a) st)
+ let ratio = (-.f_a) /. (1. +. float_of_int b -. f_a) in
+ if Random.State.float st 1. <= ratio then - (Gen.int_bound (- (a+1)) st) - 1
else int_bound b st
)
--
2.28.0

View File

@ -0,0 +1,25 @@
From 7616e43b4d011ef90e7e20f47e9837c660d8428f Mon Sep 17 00:00:00 2001
From: Jan Midtgaard <jmid@mmmi.sdu.dk>
Date: Thu, 12 Nov 2020 12:47:28 +0100
Subject: [PATCH 2/2] rm needless .Gen
---
src/core/QCheck.ml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/QCheck.ml b/src/core/QCheck.ml
index 67d6e3a..f05f73c 100644
--- a/src/core/QCheck.ml
+++ b/src/core/QCheck.ml
@@ -172,7 +172,7 @@ module Gen = struct
fun st ->
let f_a = float_of_int a in
let ratio = (-.f_a) /. (1. +. float_of_int b -. f_a) in
- if Random.State.float st 1. <= ratio then - (Gen.int_bound (- (a+1)) st) - 1
+ if Random.State.float st 1. <= ratio then - (int_bound (- (a+1)) st) - 1
else int_bound b st
)
--
2.28.0

View File

@ -1,11 +1,15 @@
Name: ocaml-qcheck Name: ocaml-qcheck
Version: 0.16 Version: 0.16
Release: 1%{?dist}.1 Release: 2%{?dist}
Summary: QuickCheck inspired property-based testing for OCaml Summary: QuickCheck inspired property-based testing for OCaml
License: BSD License: BSD
URL: https://github.com/c-cube/qcheck URL: https://github.com/c-cube/qcheck
Source0: https://github.com/c-cube/qcheck/archive/%{version}/%{name}-%{version}.tar.gz Source0: https://github.com/c-cube/qcheck/archive/%{version}/%{name}-%{version}.tar.gz
# Upstream patch to fix https://github.com/c-cube/qcheck/issues/100
Patch0: 0001-Fixes-distribution-and-min_int-issues.patch
# Small fix to the previous patch
Patch1: 0002-rm-needless-.Gen.patch
BuildRequires: ocaml >= 4.03.0 BuildRequires: ocaml >= 4.03.0
BuildRequires: ocaml-dune BuildRequires: ocaml-dune
@ -40,7 +44,7 @@ Documentation for %{name}.
%prep %prep
%autosetup -n qcheck-%{version} %autosetup -n qcheck-%{version} -p1
%build %build
@ -104,6 +108,9 @@ dune runtest --no-buffer --profile release
%changelog %changelog
* Wed Dec 2 2020 Jerry James <loganjerry@gmail.com> - 0.16-2
- Add upstream patches to fix numeric range issues
* Thu Nov 12 2020 Jerry James <loganjerry@gmail.com> - 0.16-1.1 * Thu Nov 12 2020 Jerry James <loganjerry@gmail.com> - 0.16-1.1
- Rebuild to fix broken ocaml-fmt dependency - Rebuild to fix broken ocaml-fmt dependency