From a81b8ba7a2574b33c2cdfd5b7dc3dd8187503bd6 Mon Sep 17 00:00:00 2001 From: Johannes Waldmann Date: Thu, 22 Jul 2021 18:13:42 +0200 Subject: [PATCH 01/11] use larger keys for IntMaps --- containers-tests/tests/intmap-properties.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/containers-tests/tests/intmap-properties.hs b/containers-tests/tests/intmap-properties.hs index 8d26439c0..e912fd4b9 100644 --- a/containers-tests/tests/intmap-properties.hs +++ b/containers-tests/tests/intmap-properties.hs @@ -219,16 +219,16 @@ apply3 f a b c = apply f (a, b, c) {-------------------------------------------------------------------- - Arbitrary, reasonably balanced trees + Arbitrary IntMaps, including those with large keys --------------------------------------------------------------------} instance Arbitrary a => Arbitrary (IntMap a) where - arbitrary = fmap fromList arbitrary + arbitrary = fmap (fromList . fmap (\(k,v) -> (getLarge k, v))) arbitrary newtype NonEmptyIntMap a = NonEmptyIntMap {getNonEmptyIntMap :: IntMap a} deriving (Eq, Show) instance Arbitrary a => Arbitrary (NonEmptyIntMap a) where - arbitrary = fmap (NonEmptyIntMap . fromList . getNonEmpty) arbitrary + arbitrary = fmap (NonEmptyIntMap . fromList . fmap (\(k,v) -> (getLarge k, v)) . getNonEmpty) arbitrary ------------------------------------------------------------------------ From d458ed84c44668ec496b96c066515fcdea96b779 Mon Sep 17 00:00:00 2001 From: Johannes Waldmann Date: Thu, 22 Jul 2021 18:14:01 +0200 Subject: [PATCH 02/11] use larger elements for IntSets --- containers-tests/tests/intset-properties.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/containers-tests/tests/intset-properties.hs b/containers-tests/tests/intset-properties.hs index d0c10bf0b..8b769e71d 100644 --- a/containers-tests/tests/intset-properties.hs +++ b/containers-tests/tests/intset-properties.hs @@ -109,11 +109,11 @@ test_split = do split 3 (fromList [1..5]) @?= (fromList [1,2], fromList [4,5]) {-------------------------------------------------------------------- - Arbitrary, reasonably balanced trees + Arbitrary IntSets, including those with large elements --------------------------------------------------------------------} instance Arbitrary IntSet where arbitrary = do{ xs <- arbitrary - ; return (fromList xs) + ; return (fromList (fmap getLarge xs)) } {-------------------------------------------------------------------- From 227f09f0fe8251adebbdd47a1cae2fd921dd96a7 Mon Sep 17 00:00:00 2001 From: Johannes Waldmann Date: Thu, 22 Jul 2021 18:14:20 +0200 Subject: [PATCH 03/11] generate more test cases --- .github/workflows/haskell-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index dd6870e0d..f95b1fd14 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -250,7 +250,7 @@ jobs: $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always - name: tests run: | - $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct + $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct --test-option="-a 10000" - name: haddock run: | if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all ; fi From b7d5814922ed76f144357356b430829c3ac63fcb Mon Sep 17 00:00:00 2001 From: Johannes Waldmann Date: Thu, 22 Jul 2021 21:46:46 +0200 Subject: [PATCH 04/11] run fewer tests (and try to un-freeze current CI batch) --- .github/workflows/haskell-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index f95b1fd14..9ec397870 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -250,7 +250,7 @@ jobs: $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always - name: tests run: | - $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct --test-option="-a 10000" + $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct --test-option="-a 1000" - name: haddock run: | if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all ; fi From 5f04ab98526e03db3916f3db3cde02c82d6889fa Mon Sep 17 00:00:00 2001 From: Johannes Waldmann Date: Thu, 22 Jul 2021 22:22:50 +0200 Subject: [PATCH 05/11] up the number again --- .github/workflows/haskell-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 9ec397870..f95b1fd14 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -250,7 +250,7 @@ jobs: $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always - name: tests run: | - $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct --test-option="-a 1000" + $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct --test-option="-a 10000" - name: haddock run: | if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all ; fi From efb6dbf04cfe65c30c6d11cd39e09f6d393482fd Mon Sep 17 00:00:00 2001 From: Johannes Waldmann Date: Thu, 22 Jul 2021 23:08:48 +0200 Subject: [PATCH 06/11] well, binary search ... --- .github/workflows/haskell-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index f95b1fd14..780fca07a 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -250,7 +250,7 @@ jobs: $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always - name: tests run: | - $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct --test-option="-a 10000" + $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct --test-option="-a 2000" - name: haddock run: | if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all ; fi From 3d5e6b7723e8b1aee8150c56c80612ef67c6e715 Mon Sep 17 00:00:00 2001 From: Johannes Waldmann Date: Fri, 11 Mar 2022 20:38:51 +0100 Subject: [PATCH 07/11] test-options in the style of tasty --- .github/workflows/haskell-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 780fca07a..533ee4edb 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -250,7 +250,7 @@ jobs: $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always - name: tests run: | - $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct --test-option="-a 2000" + $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct --test-options="--quickcheck-tests 1000" --test-options="--quickcheck-max-size 100" --test-options="--timeout 10s" - name: haddock run: | if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all ; fi From ae54f24bca8f9128e14bd0dcfc0e60232767dbc3 Mon Sep 17 00:00:00 2001 From: Johannes Waldmann Date: Fri, 11 Mar 2022 21:20:14 +0100 Subject: [PATCH 08/11] OK, no time-out then, to see how much time CI needs here --- .github/workflows/haskell-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 533ee4edb..074b932cb 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -250,7 +250,7 @@ jobs: $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always - name: tests run: | - $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct --test-options="--quickcheck-tests 1000" --test-options="--quickcheck-max-size 100" --test-options="--timeout 10s" + $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct --test-options="--quickcheck-tests 1000" --test-options="--quickcheck-max-size 100" - name: haddock run: | if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all ; fi From ca80bbfaa6a2e318d78a75820c2792043dafd5f6 Mon Sep 17 00:00:00 2001 From: Johannes Waldmann Date: Fri, 11 Mar 2022 22:10:46 +0100 Subject: [PATCH 09/11] use several num/size combinations --- .github/workflows/haskell-ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 074b932cb..db93efa81 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -250,7 +250,10 @@ jobs: $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always - name: tests run: | - $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct --test-options="--quickcheck-tests 1000" --test-options="--quickcheck-max-size 100" + $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct + $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct --test-options="--quickcheck-tests=10000" + $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct --test-options="--quickcheck-tests=1000 --quickcheck-max-size=100" + $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct --test-options="--quickcheck-tests=10 --quickcheck-max-size=1000" - name: haddock run: | if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all ; fi From cba497dca2061a78c3c5a7be1299e8492fffdd55 Mon Sep 17 00:00:00 2001 From: Johannes Waldmann Date: Sat, 12 Mar 2022 02:50:04 +0100 Subject: [PATCH 10/11] try to select subset of tests --- .github/workflows/haskell-ci.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index db93efa81..904b05180 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -251,9 +251,12 @@ jobs: - name: tests run: | $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct - $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct --test-options="--quickcheck-tests=10000" - $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct --test-options="--quickcheck-tests=1000 --quickcheck-max-size=100" - $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct --test-options="--quickcheck-tests=10 --quickcheck-max-size=1000" + for pat in intmap intset + do + $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct --test-options="--pattern=$pat --quickcheck-tests=10000" + $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct --test-options="--pattern=$pat --quickcheck-tests=1000 --quickcheck-max-size=100" + $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct --test-options="--pattern=$pat --quickcheck-tests=10 --quickcheck-max-size=1000" + done - name: haddock run: | if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all ; fi From b74aea4abbb048dcf05834c62bd1a3d9f7abd067 Mon Sep 17 00:00:00 2001 From: Johannes Waldmann Date: Sat, 12 Mar 2022 02:54:14 +0100 Subject: [PATCH 11/11] syntax --- .github/workflows/haskell-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 904b05180..49c3b3aa2 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -251,12 +251,12 @@ jobs: - name: tests run: | $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct - for pat in intmap intset - do - $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct --test-options="--pattern=$pat --quickcheck-tests=10000" - $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct --test-options="--pattern=$pat --quickcheck-tests=1000 --quickcheck-max-size=100" - $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct --test-options="--pattern=$pat --quickcheck-tests=10 --quickcheck-max-size=1000" - done + $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct --test-options="--pattern=intset --quickcheck-tests=10000" + $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct --test-options="--pattern=intset --quickcheck-tests=1000 --quickcheck-max-size=100" + $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct --test-options="--pattern=intset --quickcheck-tests=10 --quickcheck-max-size=1000" + $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct --test-options="--pattern=intmap --quickcheck-tests=10000" + $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct --test-options="--pattern=intmap --quickcheck-tests=1000 --quickcheck-max-size=100" + $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct --test-options="--pattern=intmap --quickcheck-tests=10 --quickcheck-max-size=1000" - name: haddock run: | if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all ; fi