From 2c400d935a0e039c85df19679a5aa3b618a24862c0eb1824016f803067f4fb55 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Nov 2023 14:07:21 +0000 Subject: [PATCH] osc copypac from project:devel:languages:haskell:ghc-9.6.x package:ghc-tasty revision:10, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-tasty?expand=0&rev=20 --- ghc-tasty.changes | 38 ++++++++++++++ ghc-tasty.spec | 7 ++- riscv64-unbounded-delays.patch | 24 +++------ tasty-1.4.3.tar.gz | 3 -- tasty-1.5.tar.gz | 3 ++ tasty.cabal | 93 ++++++++++++++++++++++++++++++++++ 6 files changed, 145 insertions(+), 23 deletions(-) delete mode 100644 tasty-1.4.3.tar.gz create mode 100644 tasty-1.5.tar.gz create mode 100644 tasty.cabal diff --git a/ghc-tasty.changes b/ghc-tasty.changes index 3ed422e..d064113 100644 --- a/ghc-tasty.changes +++ b/ghc-tasty.changes @@ -1,3 +1,41 @@ +------------------------------------------------------------------- +Wed Sep 27 20:38:15 UTC 2023 - Peter Simons + +- Update tasty to version 1.5 revision 1. + Version 1.5 + --------------- + + _2023-09-10_ + + * Progress reporting is no longer ignored. + `PrintTest` constructor of `TestOutput` now has an extra field used to report progress. + Supply `const (pure ())` as this extra field value if you want to skip progress reporting + ([#311](https://github.com/UnkindPartition/tasty/pull/311)). + * `foldGroup` now takes `[b]` instead of `b` as its last argument to allow + for custom fold strategies. This is a backwards incompatible change, + but you can get the old behavior by applying `mconcat` + ([#364](https://github.com/UnkindPartition/tasty/issues/364)). + * Dependency loop error now lists all test cases that formed a cycle + ([#340](https://github.com/UnkindPartition/tasty/issues/340)). + * Dependencies can now be defined pattern-free with `sequentialTestGroup` + ([#343](https://github.com/UnkindPartition/tasty/issues/343)). + * Added `--min-duration-to-report` flag that specifies the time a test + must take before `tasty` outputs timing information + ([#341](https://github.com/UnkindPartition/tasty/issues/341)). + * When a test failed with an exception, print it using `displayException` + instead of `show` + ([#330](https://github.com/UnkindPartition/tasty/issues/330)). + * The `-p` / `--pattern` option can be specified multiple times; + only tests that match all patterns are run + ([#380](https://github.com/UnkindPartition/tasty/pull/380)). + * Fix color scheme to make info messages visible in terminals with white background + ([#369](https://github.com/UnkindPartition/tasty/pull/369)). + * When parsing of a command-line option failed, report received option + ([#368](https://github.com/UnkindPartition/tasty/pull/368)). + * Support WASM + ([#365](https://github.com/UnkindPartition/tasty/pull/365)). + * Tested with GHC 8.0 - 9.8. + ------------------------------------------------------------------- Wed Aug 2 17:23:04 UTC 2023 - Andreas Schwab diff --git a/ghc-tasty.spec b/ghc-tasty.spec index cb11acc..ba1cc37 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -19,12 +19,13 @@ %global pkg_name tasty %global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 1.4.3 +Version: 1.5 Release: 0 Summary: Modern and extensible testing framework License: MIT URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal # https://github.com/UnkindPartition/tasty/pull/371 Patch0: riscv64-unbounded-delays.patch BuildRequires: ghc-Cabal-devel @@ -79,7 +80,9 @@ Supplements: (ghc-%{pkg_name}-devel and ghc-prof) This package provides the Haskell %{pkg_name} profiling library. %prep -%autosetup -n %{pkg_name}-%{version} -p1 +%setup -q -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal +%autopatch -p0 %build %ghc_lib_build diff --git a/riscv64-unbounded-delays.patch b/riscv64-unbounded-delays.patch index 7bd9f52..dc3d9ff 100644 --- a/riscv64-unbounded-delays.patch +++ b/riscv64-unbounded-delays.patch @@ -1,25 +1,13 @@ -From 65da3d6512ee2f8c53d2bbde840456749c5038c8 Mon Sep 17 00:00:00 2001 -From: Felix Yan -Date: Thu, 22 Jun 2023 08:21:17 +0300 -Subject: [PATCH] Don't depend on unbounded-delays for riscv64 - -64-bit RISC-V should fall into the same case in -https://github.com/UnkindPartition/tasty/pull/344 and should be added -here. Tested locally. ---- - core/tasty.cabal | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: tasty-1.4.3/tasty.cabal +Index: tasty.cabal =================================================================== ---- tasty-1.4.3.orig/tasty.cabal -+++ tasty-1.4.3/tasty.cabal -@@ -68,7 +68,7 @@ library - ansi-terminal >= 0.9 +--- tasty.cabal.orig 2023-11-07 17:48:13.765306814 +0000 ++++ tasty.cabal 2023-11-07 17:48:44.757109342 +0000 +@@ -69,7 +69,7 @@ library + ansi-terminal >= 0.9 && < 1.1 -- No reason to depend on unbounded-delays on 64-bit architecture - if(!arch(x86_64) && !arch(aarch64)) + if(!arch(x86_64) && !arch(aarch64) && !arch(riscv64)) build-depends: - unbounded-delays >= 0.1 + unbounded-delays >= 0.1 && < 0.2 diff --git a/tasty-1.4.3.tar.gz b/tasty-1.4.3.tar.gz deleted file mode 100644 index 25050b7..0000000 --- a/tasty-1.4.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f420da9560267271dce8a0007a1cb77c06987f0d129eb0f613110ce61f71cb00 -size 58726 diff --git a/tasty-1.5.tar.gz b/tasty-1.5.tar.gz new file mode 100644 index 0000000..cff9fb2 --- /dev/null +++ b/tasty-1.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca5cf7852a210e691d4dce67ee34de7ccb8ae390a3a68ecffde307e326d029ac +size 65023 diff --git a/tasty.cabal b/tasty.cabal new file mode 100644 index 0000000..53b44fb --- /dev/null +++ b/tasty.cabal @@ -0,0 +1,93 @@ +cabal-version: >=1.10 +name: tasty +version: 1.5 +x-revision: 1 +synopsis: Modern and extensible testing framework +description: Tasty is a modern testing framework for Haskell. + It lets you combine your unit tests, golden + tests, QuickCheck/SmallCheck properties, and any + other types of tests into a single test suite. +license: MIT +license-file: LICENSE +author: Roman Cheplyaka +maintainer: Roman Cheplyaka +homepage: https://github.com/UnkindPartition/tasty +bug-reports: https://github.com/UnkindPartition/tasty/issues +-- copyright: +category: Testing +build-type: Simple +extra-source-files: CHANGELOG.md, README.md + +Source-repository head + type: git + location: https://github.com/UnkindPartition/tasty.git + subdir: core + +flag unix + description: + Depend on the unix package to install signal handlers + default: True + +library + exposed-modules: + Test.Tasty, + Test.Tasty.Options, + Test.Tasty.Providers, + Test.Tasty.Providers.ConsoleFormat, + Test.Tasty.Runners + Test.Tasty.Ingredients, + Test.Tasty.Ingredients.Basic + Test.Tasty.Ingredients.ConsoleReporter + + -- for testing only + Test.Tasty.Patterns.Types + Test.Tasty.Patterns.Parser + Test.Tasty.Patterns.Printer + Test.Tasty.Patterns.Eval + other-modules: + Control.Concurrent.Async + Test.Tasty.Parallel, + Test.Tasty.Core, + Test.Tasty.Options.Core, + Test.Tasty.Options.Env, + Test.Tasty.Patterns, + Test.Tasty.Patterns.Expr, + Test.Tasty.Run, + Test.Tasty.Runners.Reducers, + Test.Tasty.Runners.Utils, + Test.Tasty.CmdLine, + Test.Tasty.Ingredients.ListTests + Test.Tasty.Ingredients.IncludingOptions + + build-depends: + base >= 4.9 && < 5, + stm >= 2.3 && < 2.6, + containers < 0.8, + transformers >= 0.5 && < 0.7, + tagged >= 0.5 && < 0.9, + optparse-applicative >= 0.14 && < 0.19, + ansi-terminal >= 0.9 && < 1.1 + + -- No reason to depend on unbounded-delays on 64-bit architecture + if(!arch(x86_64) && !arch(aarch64)) + build-depends: + unbounded-delays >= 0.1 && < 0.2 + + if(!impl(ghc >= 8.0)) + build-depends: semigroups < 0.21 + + if(!impl(ghc >= 8.4)) + build-depends: time >= 1.4 && < 1.13 + + if !os(windows) && !impl(ghcjs) + cpp-options: -DUSE_WCWIDTH + if flag(unix) + build-depends: unix < 2.9 + + -- hs-source-dirs: + default-language: Haskell2010 + default-extensions: CPP, ScopedTypeVariables, DeriveDataTypeable + ghc-options: + -Wall + -Wno-incomplete-uni-patterns + -Wcompat