From cec0bef7870ae044609f6df47287d0b5a95a5fa9 Mon Sep 17 00:00:00 2001 From: Marek Kubica Date: Mon, 30 Jan 2023 15:35:37 +0100 Subject: [PATCH 1/6] Do not run qcheck-alcotest tests on OCaml 5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Tests succeed but expect tests fails with different amount of shrink steps: #=== ERROR while compiling qcheck-alcotest.0.18 ===============================# # context 2.2.0~alpha~dev | linux/x86_64 | ocaml-base-compiler.5.0.0 | file:///home/opam/opam-repository # path ~/.opam/5.0/.opam-switch/build/qcheck-alcotest.0.18 # command ~/.opam/opam-init/hooks/sandbox.sh build dune runtest -p qcheck-alcotest -j 31 # exit-code 1 # env-file ~/.opam/log/qcheck-alcotest-7-fbdbca.env # output-file ~/.opam/log/qcheck-alcotest-7-fbdbca.out ### output ### # File "example/alcotest/output.txt.expected", line 1, characters 0-0: # /usr/bin/git --no-pager diff --no-index --color=always -u _build/default/example/alcotest/output.txt.expected _build/default/example/alcotest/output.txt # diff --git a/_build/default/example/alcotest/output.txt.expected b/_build/default/example/alcotest/output.txt # index bde0b83..c3762a8 100644 # --- a/_build/default/example/alcotest/output.txt.expected # +++ b/_build/default/example/alcotest/output.txt # @@ -11,9 +11,9 @@ Testing `my test'. # │ [FAIL] suite 1 fail_sort_id. │ # └──────────────────────────────────────────────────────────────────────────────┘ # # -test `fail_sort_id` failed on ≥ 1 cases: [1; 0] (after 20 shrink steps) # +test `fail_sort_id` failed on ≥ 1 cases: [1; 0] (after 15 shrink steps) # # -[exception] test `fail_sort_id` failed on ≥ 1 cases: [1; 0] (after 20 shrink steps) # +[exception] test `fail_sort_id` failed on ≥ 1 cases: [1; 0] (after 15 shrink steps) # # # --- packages/qcheck-alcotest/qcheck-alcotest.0.18.1/opam | 2 +- packages/qcheck-alcotest/qcheck-alcotest.0.18/opam | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/qcheck-alcotest/qcheck-alcotest.0.18.1/opam b/packages/qcheck-alcotest/qcheck-alcotest.0.18.1/opam index 76bc1984c96..55b4a5dcae2 100644 --- a/packages/qcheck-alcotest/qcheck-alcotest.0.18.1/opam +++ b/packages/qcheck-alcotest/qcheck-alcotest.0.18.1/opam @@ -13,7 +13,7 @@ tags: [ build: [ ["dune" "build" "-p" name "-j" jobs] ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc} - ["dune" "runtest" "-p" name "-j" jobs] {with-test} + ["dune" "runtest" "-p" name "-j" jobs] {with-test & ocaml:version < "5.0.0"} ] depends: [ "dune" { >= "2.2" } diff --git a/packages/qcheck-alcotest/qcheck-alcotest.0.18/opam b/packages/qcheck-alcotest/qcheck-alcotest.0.18/opam index 23f170a0d05..5c0cdbbaf7a 100644 --- a/packages/qcheck-alcotest/qcheck-alcotest.0.18/opam +++ b/packages/qcheck-alcotest/qcheck-alcotest.0.18/opam @@ -13,7 +13,7 @@ tags: [ build: [ ["dune" "build" "-p" name "-j" jobs] ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc} - ["dune" "runtest" "-p" name "-j" jobs] {with-test} + ["dune" "runtest" "-p" name "-j" jobs] {with-test & ocaml:version < "5.0.0"} ] depends: [ "dune" { >= "2.2" } From bf604da9856b245272340808b7a12ef9307f6310 Mon Sep 17 00:00:00 2001 From: Marek Kubica Date: Mon, 30 Jan 2023 15:40:11 +0100 Subject: [PATCH 2/6] Do not test qcheck-alcotest.0.19 on OCaml 5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The tests fail because the RNG operates differently so while they act the same they fail with different error messages which makes the expect tests fail. #=== ERROR while compiling qcheck-alcotest.0.19 ===============================# # context 2.2.0~alpha~dev | linux/x86_64 | ocaml-base-compiler.5.0.0 | file:///home/opam/opam-repository # path ~/.opam/5.0/.opam-switch/build/qcheck-alcotest.0.19 # command ~/.opam/opam-init/hooks/sandbox.sh build dune runtest -p qcheck-alcotest -j 31 # exit-code 1 # env-file ~/.opam/log/qcheck-alcotest-10-fb5ffb.env # output-file ~/.opam/log/qcheck-alcotest-10-fb5ffb.out ### output ### # File "example/alcotest/output.txt.expected.64", line 1, characters 0-0: # /usr/bin/git --no-pager diff --no-index --color=always -u _build/default/example/alcotest/output.txt.expected.64 _build/default/example/alcotest/output.txt # diff --git a/_build/default/example/alcotest/output.txt.expected.64 b/_build/default/example/alcotest/output.txt # index ea706c7..23401ac 100644 # --- a/_build/default/example/alcotest/output.txt.expected.64 # +++ b/_build/default/example/alcotest/output.txt # @@ -12,18 +12,18 @@ Testing `my test'. # ┌──────────────────────────────────────────────────────────────────────────────┐ # │ [FAIL] suite 1 fail_sort_id. │ # └──────────────────────────────────────────────────────────────────────────────┘ # -test `fail_sort_id` failed on ≥ 1 cases: [1; 0] (after 11 shrink steps) # -[exception] test `fail_sort_id` failed on ≥ 1 cases: [1; 0] (after 11 shrink steps) # +test `fail_sort_id` failed on ≥ 1 cases: [1; 0] (after 16 shrink steps) # +[exception] test `fail_sort_id` failed on ≥ 1 cases: [1; 0] (after 16 shrink steps) # ────────────────────────────────────────────────────────────────────────────── # ┌──────────────────────────────────────────────────────────────────────────────┐ # │ [FAIL] suite 2 error_raise_exn. │ # └──────────────────────────────────────────────────────────────────────────────┘ # test `error_raise_exn` # raised exception `Error` # -on `0 (after 63 shrink steps)` # +on `0 (after 62 shrink steps)` # [exception] test `error_raise_exn` # raised exception `Error` # -on `0 (after 63 shrink steps)` # +on `0 (after 62 shrink steps)` # ────────────────────────────────────────────────────────────────────────────── # ┌──────────────────────────────────────────────────────────────────────────────┐ # │ [FAIL] suite 4 neg test unexpected success. │ # @@ -63,18 +63,21 @@ fail # └──────────────────────────────────────────────────────────────────────────────┘ # ~~~ Shrink ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Test debug_shrink successfully shrunk counter example (step 0) to: # -(3, 1) # +(2, 3) # ~~~ Shrink ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Test debug_shrink successfully shrunk counter example (step 1) to: # -(2, 1) # +(1, 3) # ~~~ Shrink ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Test debug_shrink successfully shrunk counter example (step 2) to: # -(2, 0) # +(0, 3) # ~~~ Shrink ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Test debug_shrink successfully shrunk counter example (step 3) to: # -(1, 0) # -law debug_shrink: 2 relevant cases (2 total) # -test `debug_shrink` failed on ≥ 1 cases: (1, 0) (after 3 shrink steps) # -[exception] test `debug_shrink` failed on ≥ 1 cases: (1, 0) (after 3 shrink steps) # +(0, 2) # +~~~ Shrink ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # +Test debug_shrink successfully shrunk counter example (step 4) to: # +(0, 1) # +law debug_shrink: 1 relevant cases (1 total) # +test `debug_shrink` failed on ≥ 1 cases: (0, 1) (after 4 shrink steps) # +[exception] test `debug_shrink` failed on ≥ 1 cases: (0, 1) (after 4 shrink steps) # ────────────────────────────────────────────────────────────────────────────── # 6 failures! 9 tests run. - File "example/alcotest/output.txt.expected.64", line 1, characters 0-0: - /usr/bin/git --no-pager diff --no-index --color=always -u _build/default/example/alcotest/output.txt.expected.64 _build/default/example/alcotest/output.txt - diff --git a/_build/default/example/alcotest/output.txt.expected.64 b/_build/default/example/alcotest/output.txt - index ea706c7..23401ac 100644 - --- a/_build/default/example/alcotest/output.txt.expected.64 - +++ b/_build/default/example/alcotest/output.txt - @@ -12,18 +12,18 @@ Testing `my test'. - ┌──────────────────────────────────────────────────────────────────────────────┐ - │ [FAIL] suite 1 fail_sort_id. │ - └──────────────────────────────────────────────────────────────────────────────┘ - -test `fail_sort_id` failed on ≥ 1 cases: [1; 0] (after 11 shrink steps) - -[exception] test `fail_sort_id` failed on ≥ 1 cases: [1; 0] (after 11 shrink steps) - +test `fail_sort_id` failed on ≥ 1 cases: [1; 0] (after 16 shrink steps) - +[exception] test `fail_sort_id` failed on ≥ 1 cases: [1; 0] (after 16 shrink steps) - ────────────────────────────────────────────────────────────────────────────── - ┌──────────────────────────────────────────────────────────────────────────────┐ - │ [FAIL] suite 2 error_raise_exn. │ - └──────────────────────────────────────────────────────────────────────────────┘ - test `error_raise_exn` - raised exception `Error` - -on `0 (after 63 shrink steps)` - +on `0 (after 62 shrink steps)` - [exception] test `error_raise_exn` - raised exception `Error` - -on `0 (after 63 shrink steps)` - +on `0 (after 62 shrink steps)` - ────────────────────────────────────────────────────────────────────────────── - ┌──────────────────────────────────────────────────────────────────────────────┐ - │ [FAIL] suite 4 neg test unexpected success. │ - @@ -63,18 +63,21 @@ fail - └──────────────────────────────────────────────────────────────────────────────┘ - ~~~ Shrink ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - Test debug_shrink successfully shrunk counter example (step 0) to: - -(3, 1) - +(2, 3) - ~~~ Shrink ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - Test debug_shrink successfully shrunk counter example (step 1) to: - -(2, 1) - +(1, 3) - ~~~ Shrink ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - Test debug_shrink successfully shrunk counter example (step 2) to: - -(2, 0) - +(0, 3) - ~~~ Shrink ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - Test debug_shrink successfully shrunk counter example (step 3) to: - -(1, 0) - -law debug_shrink: 2 relevant cases (2 total) - -test `debug_shrink` failed on ≥ 1 cases: (1, 0) (after 3 shrink steps) - -[exception] test `debug_shrink` failed on ≥ 1 cases: (1, 0) (after 3 shrink steps) - +(0, 2) - +~~~ Shrink ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - +Test debug_shrink successfully shrunk counter example (step 4) to: - +(0, 1) - +law debug_shrink: 1 relevant cases (1 total) - +test `debug_shrink` failed on ≥ 1 cases: (0, 1) (after 4 shrink steps) - +[exception] test `debug_shrink` failed on ≥ 1 cases: (0, 1) (after 4 shrink steps) - ────────────────────────────────────────────────────────────────────────────── - 6 failures! 9 tests run. --- packages/qcheck-alcotest/qcheck-alcotest.0.19/opam | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/qcheck-alcotest/qcheck-alcotest.0.19/opam b/packages/qcheck-alcotest/qcheck-alcotest.0.19/opam index 7ba792d0446..931f37e90cd 100644 --- a/packages/qcheck-alcotest/qcheck-alcotest.0.19/opam +++ b/packages/qcheck-alcotest/qcheck-alcotest.0.19/opam @@ -19,7 +19,7 @@ depends: [ build: [ ["dune" "build" "-p" name "-j" jobs] ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc} - ["dune" "runtest" "-p" name "-j" jobs] {with-test} + ["dune" "runtest" "-p" name "-j" jobs] {with-test & ocaml:version < "5.0.0"} ] dev-repo: "git+https://github.com/c-cube/qcheck.git" url { @@ -28,4 +28,4 @@ url { "md5=6913306eb3065da1dee749d67732cb01" "sha512=ab77384e64887c4c88d6e641f433709a83bafc7cd2d05d548fdfee3593beb3bc5c4345db03e324e033ecd4fd2ae600fa92cea3e5753d5e322d13a01ba787eeb6" ] -} \ No newline at end of file +} From 2bf8b5bcb3b1aca63e5fc470531e457ab10fce76 Mon Sep 17 00:00:00 2001 From: Marek Kubica Date: Mon, 30 Jan 2023 16:03:21 +0100 Subject: [PATCH 3/6] Do not build qcheck core tests on OCaml 5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The error message is multiple thousand lines of failing expect tests with numbers that probably changed because of the RNG. Short exerpt: #=== ERROR while compiling qcheck-core.0.19 ===================================# # context 2.2.0~alpha~dev | linux/x86_64 | ocaml-base-compiler.5.0.0 | file:///home/opam/opam-repository # path ~/.opam/5.0/.opam-switch/build/qcheck-core.0.19 # command ~/.opam/opam-init/hooks/sandbox.sh build dune runtest -p qcheck-core -j 47 # exit-code 1 # env-file ~/.opam/log/qcheck-core-7-852e05.env # output-file ~/.opam/log/qcheck-core-7-852e05.out ### output ### # (cd _build/default/test/core && ./QCheck_unit_tests.exe) # Testing `QCheck'. # This run has ID `E344FKYG'. # # [OK] Shrink 0 int. # [OK] Shrink 1 int32. # [OK] Shrink 2 int64. # [OK] Shrink 3 char. # [OK] Shrink 4 char_numeral. # [OK] Shrink 5 char_printable. # [OK] Test.check_exn 0 check_exn pass trivial. # [OK] Test.check_exn 1 check_exn pass random. # [OK] Test.check_exn 2 check_exn fail always. # [OK] Test.check_exn 3 check_exn fail random. # [OK] Test.check_exn 4 check_exn Error. # [OK] Test.make ~count 0 make with custom count. # [OK] Test.make ~count 1 make with default count. # [OK] Test.make ~count 2 make with env count. # [OK] Test.make ~long_factor 0 make with custom long_fac... # [OK] Test.make ~long_factor 1 make with default long_fa... # [OK] Test.make ~long_factor 2 make with env long_factor. # # Full test results in `~/.opam/5.0/.opam-switch/build/qcheck-core.0.19/_build/default/test/core/_build/_tests/QCheck'. # Test Successful in 0.006s. 17 tests run. # File "_build/.dune/default/test/core/dune", line 46, characters 27-45: # 46 | (names QCheck_unit_tests QCheck2_unit_tests) # ^^^^^^^^^^^^^^^^^^ # (cd _build/default/test/core && ./QCheck2_unit_tests.exe) # Testing `QCheck2'. # This run has ID `B1O7KQ46'. # # [OK] Shrink 0 int_towards. # [OK] Shrink 1 int32_towards. # [OK] Shrink 2 int64_towards. # [OK] Shrink 3 float_towards. # > [FAIL] Shrink 4 Gen.char tree. # [FAIL] Shrink 5 Gen.numeral tree. # [FAIL] Shrink 6 Gen.printable tree. # [OK] Gen 0 option with default ratio. # [OK] Gen 1 option with custom ratio. # [OK] Test.make ~count 0 make with custom count. # [OK] Test.make ~count 1 make with default count. # [OK] Test.make ~count 2 make with env count. # [OK] Test.make ~long_factor 0 make with custom long_fac... # [OK] Test.make ~long_factor 1 make with default long_fa... # [OK] Test.make ~long_factor 2 make with env long_factor. # [OK] String 0 shrinking. # [OK] Test.check_exn 0 check_exn pass trivial. # [OK] Test.check_exn 1 check_exn pass random. # [OK] Test.check_exn 2 check_exn fail always. # [OK] Test.check_exn 3 check_exn fail random. # [OK] Test.check_exn 4 check_exn Error. # # ┌──────────────────────────────────────────────────────────────────────────────┐ # │ [FAIL] Shrink 4 Gen.char tree. │ # └──────────────────────────────────────────────────────────────────────────────┘ # ASSERT 'k' on repeated failure # FAIL 'k' on repeated failure # # Expected: `['k'; 'a'; 'f'; 'h'; 'i'; 'j']' # Received: `['>'; 'a'; 'P'; 'G'; 'C'; 'A'; '@'; '?']' # # Raised at Alcotest_engine__Test.check in file "src/alcotest-engine/test.ml", line 196, characters 4-261 # Called from Alcotest_engine__Test.check' in file "src/alcotest-engine/test.ml" (inlined), line 209, characters 2-40 # Called from Dune__exe__QCheck2_unit_tests.Shrink.test_char in file "test/core/QCheck2_unit_tests.ml", line 74, characters 4-195 # Called from Alcotest_engine__Core.Make.protect_test.(fun) in file "src/alcotest-engine/core.ml", line 180, characters 17-23 # Called from Alcotest_engine__Monad.Identity.catch in file "src/alcotest-engine/monad.ml", line 24, characters 31-35 --- packages/qcheck-core/qcheck-core.0.18.1/opam | 2 +- packages/qcheck-core/qcheck-core.0.18/opam | 2 +- packages/qcheck-core/qcheck-core.0.19/opam | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/qcheck-core/qcheck-core.0.18.1/opam b/packages/qcheck-core/qcheck-core.0.18.1/opam index 04662a21e5f..47189c9f735 100644 --- a/packages/qcheck-core/qcheck-core.0.18.1/opam +++ b/packages/qcheck-core/qcheck-core.0.18.1/opam @@ -12,7 +12,7 @@ tags: [ build: [ ["dune" "build" "-p" name "-j" jobs] ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc} - ["dune" "runtest" "-p" name "-j" jobs] {with-test} + ["dune" "runtest" "-p" name "-j" jobs] {with-test & ocaml:version < "5.0.0"} ] depends: [ "dune" { >= "2.2" } diff --git a/packages/qcheck-core/qcheck-core.0.18/opam b/packages/qcheck-core/qcheck-core.0.18/opam index 51b41094f49..610a094f105 100644 --- a/packages/qcheck-core/qcheck-core.0.18/opam +++ b/packages/qcheck-core/qcheck-core.0.18/opam @@ -12,7 +12,7 @@ tags: [ build: [ ["dune" "build" "-p" name "-j" jobs] ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc} - ["dune" "runtest" "-p" name "-j" jobs] {with-test} + ["dune" "runtest" "-p" name "-j" jobs] {with-test & ocaml:version < "5.0.0"} ] depends: [ "dune" { >= "2.2" } diff --git a/packages/qcheck-core/qcheck-core.0.19/opam b/packages/qcheck-core/qcheck-core.0.19/opam index 9bf1620a086..ad70f21fdb9 100644 --- a/packages/qcheck-core/qcheck-core.0.19/opam +++ b/packages/qcheck-core/qcheck-core.0.19/opam @@ -21,7 +21,7 @@ conflicts: [ build: [ ["dune" "build" "-p" name "-j" jobs] ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc} - ["dune" "runtest" "-p" name "-j" jobs] {with-test} + ["dune" "runtest" "-p" name "-j" jobs] {with-test & ocaml:version < "5.0.0"} ] dev-repo: "git+https://github.com/c-cube/qcheck.git" url { @@ -30,4 +30,4 @@ url { "md5=6913306eb3065da1dee749d67732cb01" "sha512=ab77384e64887c4c88d6e641f433709a83bafc7cd2d05d548fdfee3593beb3bc5c4345db03e324e033ecd4fd2ae600fa92cea3e5753d5e322d13a01ba787eeb6" ] -} \ No newline at end of file +} From 2139366415c6b38a5172d884fac33158a368f885 Mon Sep 17 00:00:00 2001 From: Marek Kubica Date: Mon, 30 Jan 2023 16:06:31 +0100 Subject: [PATCH 4/6] Do not run qcheck-ounit tests on OCaml 5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Error messages are due to different amount of shrink steps: #=== ERROR while compiling qcheck-ounit.0.19 ==================================# # context 2.2.0~alpha~dev | linux/x86_64 | ocaml-base-compiler.5.0.0 | file:///home/opam/opam-repository # path ~/.opam/5.0/.opam-switch/build/qcheck-ounit.0.19 # command ~/.opam/opam-init/hooks/sandbox.sh build dune runtest -p qcheck-ounit -j 31 # exit-code 1 # env-file ~/.opam/log/qcheck-ounit-8-2e9d56.env # output-file ~/.opam/log/qcheck-ounit-8-2e9d56.out ### output ### # File "example/ounit/output.txt.expected.64", line 1, characters 0-0: # /usr/bin/git --no-pager diff --no-index --color=always -u _build/default/example/ounit/output.txt.expected.64 _build/default/example/ounit/output.txt # diff --git a/_build/default/example/ounit/output.txt.expected.64 b/_build/default/example/ounit/output.txt # index 874cd52..2294b90 100644 # --- a/_build/default/example/ounit/output.txt.expected.64 # +++ b/_build/default/example/ounit/output.txt # @@ -17,7 +17,7 @@ Error: tests:2:error_raise_exn (in the log). # # # test `error_raise_exn` raised exception `Dune__exe__QCheck_ounit_test.Error` # -on `0 (after 63 shrink steps)` # +on `0 (after 62 shrink steps)` # # ------------------------------------------------------------------------------ # ============================================================================== # @@ -57,7 +57,7 @@ Error: tests:1:fail_sort_id (in the log). # Error: tests:1:fail_sort_id (in the code). # # # -test `fail_sort_id` failed on ≥ 1 cases: [1; 0] (after 11 shrink steps) # +test `fail_sort_id` failed on ≥ 1 cases: [1; 0] (after 16 shrink steps) # # # ------------------------------------------------------------------------------ --- packages/qcheck-ounit/qcheck-ounit.0.18.1/opam | 2 +- packages/qcheck-ounit/qcheck-ounit.0.18/opam | 2 +- packages/qcheck-ounit/qcheck-ounit.0.19/opam | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/qcheck-ounit/qcheck-ounit.0.18.1/opam b/packages/qcheck-ounit/qcheck-ounit.0.18.1/opam index db9726bc068..09bd51235e0 100644 --- a/packages/qcheck-ounit/qcheck-ounit.0.18.1/opam +++ b/packages/qcheck-ounit/qcheck-ounit.0.18.1/opam @@ -12,7 +12,7 @@ tags: [ build: [ ["dune" "build" "-p" name "-j" jobs] ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc} - ["dune" "runtest" "-p" name "-j" jobs] {with-test} + ["dune" "runtest" "-p" name "-j" jobs] {with-test & ocaml:version < "5.0.0"} ] depends: [ "dune" { >= "2.2" } diff --git a/packages/qcheck-ounit/qcheck-ounit.0.18/opam b/packages/qcheck-ounit/qcheck-ounit.0.18/opam index 1cbb5efb9ad..a50127a338c 100644 --- a/packages/qcheck-ounit/qcheck-ounit.0.18/opam +++ b/packages/qcheck-ounit/qcheck-ounit.0.18/opam @@ -12,7 +12,7 @@ tags: [ build: [ ["dune" "build" "-p" name "-j" jobs] ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc} - ["dune" "runtest" "-p" name "-j" jobs] {with-test} + ["dune" "runtest" "-p" name "-j" jobs] {with-test & ocaml:version < "5.0.0"} ] depends: [ "dune" { >= "2.2" } diff --git a/packages/qcheck-ounit/qcheck-ounit.0.19/opam b/packages/qcheck-ounit/qcheck-ounit.0.19/opam index 27658f420ee..6f4ccc0074f 100644 --- a/packages/qcheck-ounit/qcheck-ounit.0.19/opam +++ b/packages/qcheck-ounit/qcheck-ounit.0.19/opam @@ -19,7 +19,7 @@ depends: [ build: [ ["dune" "build" "-p" name "-j" jobs] ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc} - ["dune" "runtest" "-p" name "-j" jobs] {with-test} + ["dune" "runtest" "-p" name "-j" jobs] {with-test & ocaml:version < "5.0.0"} ] dev-repo: "git+https://github.com/c-cube/qcheck.git" url { @@ -28,4 +28,4 @@ url { "md5=6913306eb3065da1dee749d67732cb01" "sha512=ab77384e64887c4c88d6e641f433709a83bafc7cd2d05d548fdfee3593beb3bc5c4345db03e324e033ecd4fd2ae600fa92cea3e5753d5e322d13a01ba787eeb6" ] -} \ No newline at end of file +} From 3a7ea6d19cfd8d30db00b6c8d00755264e148e9f Mon Sep 17 00:00:00 2001 From: Marek Kubica Date: Mon, 30 Jan 2023 16:08:39 +0100 Subject: [PATCH 5/6] Do not build qcheck tests on OCaml 5 The expect test hardcode the RNG behavior of OCaml 4 and thus lead to thousands of lines of failures. Short excerpt: #=== ERROR while compiling qcheck.0.18 ========================================# # context 2.2.0~alpha~dev | linux/x86_64 | ocaml-base-compiler.5.0.0 | file:///home/opam/opam-repository # path ~/.opam/5.0/.opam-switch/build/qcheck.0.18 # command ~/.opam/opam-init/hooks/sandbox.sh build dune runtest -p qcheck -j 47 # exit-code 1 # env-file ~/.opam/log/qcheck-7-cf6045.env # output-file ~/.opam/log/qcheck-7-cf6045.out ### output ### # File "example/output.txt.expected", line 1, characters 0-0: # /usr/bin/git --no-pager diff --no-index --color=always -u _build/default/example/output.txt.expected _build/default/example/output.txt # diff --git a/_build/default/example/output.txt.expected b/_build/default/example/output.txt # index 2bcc615..ce4682e 100644 # --- a/_build/default/example/output.txt.expected # +++ b/_build/default/example/output.txt # @@ -2,13 +2,13 @@ random seed: 1234 # # --- Failure -------------------------------------------------------------------- # # -Test should_fail_sort_id failed (18 shrink steps): # +Test should_fail_sort_id failed (12 shrink steps): # # [1; 0] # # === Error ====================================================================== # # -Test should_error_raise_exn errored on (63 shrink steps): # +Test should_error_raise_exn errored on (62 shrink steps): # # 0 # # @@ -19,59 +19,59 @@ exception Dune__exe__QCheck_runner_test.Error # # Collect results for test collect_results: # # -4: 20 cases # -3: 25 cases # -2: 17 cases # -1: 18 cases # -0: 20 cases # +4: 24 cases # +3: 20 cases # +2: 18 cases # +1: 21 cases # +0: 17 cases --- packages/qcheck/qcheck.0.18.1/opam | 2 +- packages/qcheck/qcheck.0.18/opam | 2 +- packages/qcheck/qcheck.0.19/opam | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/qcheck/qcheck.0.18.1/opam b/packages/qcheck/qcheck.0.18.1/opam index 040c07e2cbc..8e5aeeaf7ba 100644 --- a/packages/qcheck/qcheck.0.18.1/opam +++ b/packages/qcheck/qcheck.0.18.1/opam @@ -12,7 +12,7 @@ tags: [ build: [ ["dune" "build" "-p" name "-j" jobs] ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc} - ["dune" "runtest" "-p" name "-j" jobs] {with-test} + ["dune" "runtest" "-p" name "-j" jobs] {with-test & ocaml:version < "5.0.0"} ] depends: [ "dune" { >= "2.2" } diff --git a/packages/qcheck/qcheck.0.18/opam b/packages/qcheck/qcheck.0.18/opam index fbbf641fe34..186f801a724 100644 --- a/packages/qcheck/qcheck.0.18/opam +++ b/packages/qcheck/qcheck.0.18/opam @@ -12,7 +12,7 @@ tags: [ build: [ ["dune" "build" "-p" name "-j" jobs] ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc} - ["dune" "runtest" "-p" name "-j" jobs] {with-test} + ["dune" "runtest" "-p" name "-j" jobs] {with-test & ocaml:version < "5.0.0"} ] depends: [ "dune" { >= "2.2" } diff --git a/packages/qcheck/qcheck.0.19/opam b/packages/qcheck/qcheck.0.19/opam index 33de87d1d80..9fb9d39e97d 100644 --- a/packages/qcheck/qcheck.0.19/opam +++ b/packages/qcheck/qcheck.0.19/opam @@ -23,7 +23,7 @@ conflicts: [ build: [ ["dune" "build" "-p" name "-j" jobs] ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc} - ["dune" "runtest" "-p" name "-j" jobs] {with-test} + ["dune" "runtest" "-p" name "-j" jobs] {with-test & ocaml:version < "5.0.0"} ] dev-repo: "git+https://github.com/c-cube/qcheck.git" url { @@ -32,4 +32,4 @@ url { "md5=6913306eb3065da1dee749d67732cb01" "sha512=ab77384e64887c4c88d6e641f433709a83bafc7cd2d05d548fdfee3593beb3bc5c4345db03e324e033ecd4fd2ae600fa92cea3e5753d5e322d13a01ba787eeb6" ] -} \ No newline at end of file +} From db2d0596477dfcd1616a2f699d335e11fdcb0a71 Mon Sep 17 00:00:00 2001 From: Marek Kubica Date: Wed, 1 Feb 2023 16:28:11 +0100 Subject: [PATCH 6/6] Remove the newlines --- packages/qcheck-alcotest/qcheck-alcotest.0.19/opam | 2 +- packages/qcheck-core/qcheck-core.0.19/opam | 2 +- packages/qcheck-ounit/qcheck-ounit.0.19/opam | 2 +- packages/qcheck/qcheck.0.19/opam | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/qcheck-alcotest/qcheck-alcotest.0.19/opam b/packages/qcheck-alcotest/qcheck-alcotest.0.19/opam index 931f37e90cd..c68a7482ce1 100644 --- a/packages/qcheck-alcotest/qcheck-alcotest.0.19/opam +++ b/packages/qcheck-alcotest/qcheck-alcotest.0.19/opam @@ -28,4 +28,4 @@ url { "md5=6913306eb3065da1dee749d67732cb01" "sha512=ab77384e64887c4c88d6e641f433709a83bafc7cd2d05d548fdfee3593beb3bc5c4345db03e324e033ecd4fd2ae600fa92cea3e5753d5e322d13a01ba787eeb6" ] -} +} \ No newline at end of file diff --git a/packages/qcheck-core/qcheck-core.0.19/opam b/packages/qcheck-core/qcheck-core.0.19/opam index ad70f21fdb9..64f36395d86 100644 --- a/packages/qcheck-core/qcheck-core.0.19/opam +++ b/packages/qcheck-core/qcheck-core.0.19/opam @@ -30,4 +30,4 @@ url { "md5=6913306eb3065da1dee749d67732cb01" "sha512=ab77384e64887c4c88d6e641f433709a83bafc7cd2d05d548fdfee3593beb3bc5c4345db03e324e033ecd4fd2ae600fa92cea3e5753d5e322d13a01ba787eeb6" ] -} +} \ No newline at end of file diff --git a/packages/qcheck-ounit/qcheck-ounit.0.19/opam b/packages/qcheck-ounit/qcheck-ounit.0.19/opam index 6f4ccc0074f..4ed49931771 100644 --- a/packages/qcheck-ounit/qcheck-ounit.0.19/opam +++ b/packages/qcheck-ounit/qcheck-ounit.0.19/opam @@ -28,4 +28,4 @@ url { "md5=6913306eb3065da1dee749d67732cb01" "sha512=ab77384e64887c4c88d6e641f433709a83bafc7cd2d05d548fdfee3593beb3bc5c4345db03e324e033ecd4fd2ae600fa92cea3e5753d5e322d13a01ba787eeb6" ] -} +} \ No newline at end of file diff --git a/packages/qcheck/qcheck.0.19/opam b/packages/qcheck/qcheck.0.19/opam index 9fb9d39e97d..99df43ff594 100644 --- a/packages/qcheck/qcheck.0.19/opam +++ b/packages/qcheck/qcheck.0.19/opam @@ -32,4 +32,4 @@ url { "md5=6913306eb3065da1dee749d67732cb01" "sha512=ab77384e64887c4c88d6e641f433709a83bafc7cd2d05d548fdfee3593beb3bc5c4345db03e324e033ecd4fd2ae600fa92cea3e5753d5e322d13a01ba787eeb6" ] -} +} \ No newline at end of file