Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ocaml-ounit for openSUSE:Factory
checked in at 2023-05-23 14:53:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ocaml-ounit (Old)
and /work/SRC/openSUSE:Factory/.ocaml-ounit.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-ounit"
Tue May 23 14:53:45 2023 rev:7 rq:1086693 version:2.2.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/ocaml-ounit/ocaml-ounit.changes 2022-04-06
21:51:38.791460961 +0200
+++ /work/SRC/openSUSE:Factory/.ocaml-ounit.new.1533/ocaml-ounit.changes
2023-05-23 14:54:04.606317480 +0200
@@ -1,0 +2,6 @@
+Fri May 5 05:05:05 UTC 2023 - oher...@suse.de
+
+- Update to version 2.2.7
+ Update to Dune 3.0
+
+-------------------------------------------------------------------
Old:
----
ocaml-ounit-2.2.6.tar.xz
New:
----
ocaml-ounit-2.2.7.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ocaml-ounit.spec ++++++
--- /var/tmp/diff_new_pack.iIDqkL/_old 2023-05-23 14:54:06.790330402 +0200
+++ /var/tmp/diff_new_pack.iIDqkL/_new 2023-05-23 14:54:06.798330450 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ocaml-ounit
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%bcond_with ocaml_lwt
Name: ocaml-ounit
-Version: 2.2.6
+Version: 2.2.7
Release: 0
%{?ocaml_preserve_bytecode}
Summary: Ocaml OUnit test framework
@@ -28,9 +28,8 @@
URL: https://opam.ocaml.org/packages/ounit
Source0: %name-%version.tar.xz
BuildRequires: ocaml
-BuildRequires: ocaml-dune
-BuildRequires: ocaml-rpm-macros >= 20220222
-BuildRequires: ocamlfind(bytes)
+BuildRequires: ocaml-dune >= 3.0
+BuildRequires: ocaml-rpm-macros >= 20230101
BuildRequires: ocamlfind(seq)
BuildRequires: ocamlfind(stdlib-shims)
BuildRequires: ocamlfind(str)
++++++ _service ++++++
--- /var/tmp/diff_new_pack.iIDqkL/_old 2023-05-23 14:54:06.854330781 +0200
+++ /var/tmp/diff_new_pack.iIDqkL/_new 2023-05-23 14:54:06.858330804 +0200
@@ -1,7 +1,7 @@
<services>
<service name="tar_scm" mode="disabled">
<param name="filename">ocaml-ounit</param>
- <param name="revision">77f01c482bd618eabde7c5065beae2d68db88723</param>
+ <param name="revision">3c0464871690562b93bd2501811d5a4b9821a5aa</param>
<param name="scm">git</param>
<param name="submodules">disable</param>
<param name="url">https://github.com/gildor478/ounit.git</param>
++++++ ocaml-ounit-2.2.6.tar.xz -> ocaml-ounit-2.2.7.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-ounit-2.2.6/.github/workflows/main.yml
new/ocaml-ounit-2.2.7/.github/workflows/main.yml
--- old/ocaml-ounit-2.2.6/.github/workflows/main.yml 1970-01-01
01:00:00.000000000 +0100
+++ new/ocaml-ounit-2.2.7/.github/workflows/main.yml 2023-03-22
14:28:17.000000000 +0100
@@ -0,0 +1,46 @@
+name: Main workflow
+
+on:
+ pull_request:
+ push:
+ schedule:
+ # Prime the caches every Monday
+ - cron: 0 1 * * MON
+
+jobs:
+ build:
+ strategy:
+ fail-fast: false
+ matrix:
+ os:
+ - macos-latest
+ - windows-latest
+ ocaml-compiler:
+ - 4.14.x
+
+ runs-on: ${{ matrix.os }}
+
+ steps:
+ - name: Checkout code
+ uses: actions/checkout@v3
+
+ - name: Use OCaml ${{ matrix.ocaml-compiler }}
+ uses: ocaml/setup-ocaml@v2
+ if: ${{ runner.os }} != 'Windows'
+ with:
+ ocaml-compiler: ${{ matrix.ocaml-compiler }}
+
+ - name: Use OCaml ${{ matrix.ocaml-compiler }}
+ uses: ocaml/setup-ocaml@v2
+ if: ${{ runner.os }} == 'Windows'
+ with:
+ ocaml-compiler: ${{ matrix.ocaml-compiler }}
+ opam-repositories: |
+ opam-repository-mingw:
https://github.com/ocaml-opam/opam-repository-mingw.git#sunset
+ default: https://github.com/ocaml/opam-repository.git
+
+ - run: opam install . --deps-only --with-test
+
+ - run: opam exec -- dune build
+
+ - run: opam exec -- dune runtest
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-ounit-2.2.6/.travis.yml
new/ocaml-ounit-2.2.7/.travis.yml
--- old/ocaml-ounit-2.2.6/.travis.yml 2022-02-08 19:14:15.000000000 +0100
+++ new/ocaml-ounit-2.2.7/.travis.yml 1970-01-01 01:00:00.000000000 +0100
@@ -1,56 +0,0 @@
-language: c
-sudo: required
-install: test -e .travis.opam.sh || wget
https://raw.githubusercontent.com/ocaml/ocaml-ci-scripts/master/.travis-opam.sh
-script: bash -ex .travis-opam.sh
-env:
- global:
- - OUNIT_CI=true
-matrix:
- include:
- - name: "ounit: linux"
- os: linux
- env: OCAML_VERSION=4.10 PACKAGE="ounit"
-
- - name: "ounit-lwt: linux"
- os: linux
- env: OCAML_VERSION=4.10 PACKAGE="ounit-lwt"
-
- - name: "ounit2: linux"
- apt:
- packages:
- - libxml2-utils
- os: linux
- env: OCAML_VERSION=4.10 PACKAGE="ounit2"
-
- - name: "ounit2-lwt: linux"
- os: linux
- env: OCAML_VERSION=4.10 PACKAGE="ounit2-lwt"
-
- - name: "ounit2: reverse dependencies with linux"
- os: linux
- env: OCAML_VERSION=4.10 PACKAGE="ounit2" REVDEPS="mock-ounit junit_ounit
pa_ounit qcheck-ounit" POST_INSTALL_HOOK="opam install -t fileutils"
-
- - name: "ounit2: old ocaml release with linux"
- os: linux
- env: OCAML_VERSION=4.04 PACKAGE="ounit2"
-
- - name: "ounit: MacOSX"
- os: osx
- env: OCAML_VERSION=4.10 PACKAGE="ounit" REVDEPS="junit_ounit"
- cache:
- directories:
- - $HOME/Library/Caches/Homebrew
-
- - name: "ounit2: MacOSX"
- os: osx
- env: OCAML_VERSION=4.10 PACKAGE="ounit2" REVDEPS="junit_ounit"
- cache:
- directories:
- - $HOME/Library/Caches/Homebrew
-
- - name: "ounit2-lwt: MacOSX"
- os: osx
- env: OCAML_VERSION=4.10 PACKAGE="ounit2-lwt"
- cache:
- directories:
- - $HOME/Library/Caches/Homebrew
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-ounit-2.2.6/CHANGES.md
new/ocaml-ounit-2.2.7/CHANGES.md
--- old/ocaml-ounit-2.2.6/CHANGES.md 2022-02-08 19:14:15.000000000 +0100
+++ new/ocaml-ounit-2.2.7/CHANGES.md 2023-03-22 14:28:17.000000000 +0100
@@ -1,3 +1,16 @@
+## v2.2.7 - 2022-02-08
+
+### Fixed
+- Handle end of channel in Seq API.
+ #95, @Leonidas-from-XIV
+
+- Windows and OCaml 5 compatibility.
+ #96, @MisterDA
+
+### Changed
+- Update to Dune 3.0 for newer stanzas and warnings.
+ #96, @MisterDA
+
## v2.2.6 - 2022-02-08
### Fixed
@@ -121,19 +134,19 @@
- fix safe-string compatibility issuesi, thanks to Christoph Spiel
(Closes: OF#1760, OF#1761)
- fix some format string errors, thanks to Damien Doligez (Closes: OF#1422)
-- fix backward incompatiblity with OUnit v1 (Closes: OF#1392)
+- fix backward incompatibility with OUnit v1 (Closes: OF#1392)
## v2.0.0
- major rewrite of all the code!
-- implements a quickfix compatible way of outputing failures, it jumps to
+- implements a quickfix compatible way of outputting failures, it jumps to
the a position in the logfile to help you debug the problem.
- better configuration setup: environment variable, command line options,
configuration files (OUnitConf)
- improved output of the tests: output HTML report, output JUnit report,
systematic logging to a file (OUnitLogger*)
- choose how to run a test: in parallel using processes (auto-detect number
- of CPU), concurrently using threads or sequentialy as before.
+ of CPU), concurrently using threads or sequentially as before.
- choose which test to run: just run test in sequence (simple) or run the
tests that failed in the last run first and skip the success if they are
still failing (failfirst) (OUnitChooser)
@@ -178,7 +191,7 @@
- Add backtrace support (Closes: OF#639), thanks to Michael Ekstrand
- Use OASIS
- Move to OCaml Forge: http://ounit.forge.ocamlcore.org
-- Maintainance is now done by Sylvain Le Gall (OCamlCore SARL), thanks to
+- Maintenance is now done by Sylvain Le Gall (OCamlCore SARL), thanks to
Maas-Maarten Zeeman for all his work
## v1.0.3
@@ -210,7 +223,7 @@
## v0.0.2
-- Added assert_raises which checkes if an exception is raised.
+- Added assert_raises which checks if an exception is raised.
(thanks go to Keita Yamaguchi, for the idea)
- Fixed (hopefully) the .depend file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-ounit-2.2.6/README.md
new/ocaml-ounit-2.2.7/README.md
--- old/ocaml-ounit-2.2.6/README.md 2022-02-08 19:14:15.000000000 +0100
+++ new/ocaml-ounit-2.2.7/README.md 2023-03-22 14:28:17.000000000 +0100
@@ -1,8 +1,7 @@
OUnit - xUnit testing framework for OCaml
=========================================================================
-[![Travis status][travis-img]][travis]
-[![AppVeyor status][appveyor-img]][appveyor]
+[![GitHub Actions][gha-badge]][gha]
OUnit is a unit test framework for OCaml. It allows one to easily create
unit-tests for OCaml code. It is loosely based on [HUnit], a unit testing
@@ -14,12 +13,10 @@
- JUnit report generation
- HTML report generation
-[HUnit]: http://hunit.sourceforge.net/
-[JUnit]: http://junit.org/
-[travis]: https://travis-ci.org/gildor478/ounit
-[travis-img]: https://travis-ci.org/gildor478/ounit.svg?branch=master
-[appveyor]: https://ci.appveyor.com/project/gildor478/ounit
-[appveyor-img]:
https://ci.appveyor.com/api/projects/status/g86mhhc0dda25llx/branch/master?svg=true
+[HUnit]: https://hunit.sourceforge.net/
+[JUnit]: https://junit.org/
+[gha]: https://github.com/gildor478/ounit/actions/workflows/main.yml
+[gha-badge]:
https://github.com/gildor478/ounit/actions/workflows/main.yml/badge.svg
[opam]: https://opam.ocaml.org
Installation
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-ounit-2.2.6/appveyor.yml
new/ocaml-ounit-2.2.7/appveyor.yml
--- old/ocaml-ounit-2.2.6/appveyor.yml 2022-02-08 19:14:15.000000000 +0100
+++ new/ocaml-ounit-2.2.7/appveyor.yml 1970-01-01 01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-platform:
- - x86
-
-environment:
- FORK_USER: ocaml
- FORK_BRANCH: master
- CYG_ROOT: C:\cygwin64
- EXTRA_DEPS: dune
- OUNIT_CI: true
- PACKAGE: ounit2
-
-install:
- - ps: iex ((new-object
net.webclient).DownloadString("https://raw.githubusercontent.com/$env:FORK_USER/ocaml-ci-scripts/$env:FORK_BRANCH/appveyor-install.ps1";))
-
-build_script:
- - call %CYG_ROOT%\bin\bash.exe -l %APPVEYOR_BUILD_FOLDER%\appveyor-opam.sh
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-ounit-2.2.6/dune-project
new/ocaml-ounit-2.2.7/dune-project
--- old/ocaml-ounit-2.2.6/dune-project 2022-02-08 19:14:15.000000000 +0100
+++ new/ocaml-ounit-2.2.7/dune-project 2023-03-22 14:28:17.000000000 +0100
@@ -1,3 +1,4 @@
-(lang dune 1.11)
+(lang dune 3.0)
(name ounit)
(explicit_js_mode)
+(formatting (enabled_for dune))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-ounit-2.2.6/examples/dune
new/ocaml-ounit-2.2.7/examples/dune
--- old/ocaml-ounit-2.2.6/examples/dune 2022-02-08 19:14:15.000000000 +0100
+++ new/ocaml-ounit-2.2.7/examples/dune 2023-03-22 14:28:17.000000000 +0100
@@ -1,4 +1,4 @@
(tests
- (names test_list test_stack)
- (package ounit2)
- (libraries ounit2))
+ (names test_list test_stack)
+ (package ounit2)
+ (libraries ounit2))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-ounit-2.2.6/ounit-lwt.opam
new/ocaml-ounit-2.2.7/ounit-lwt.opam
--- old/ocaml-ounit-2.2.6/ounit-lwt.opam 2022-02-08 19:14:15.000000000
+0100
+++ new/ocaml-ounit-2.2.7/ounit-lwt.opam 2023-03-22 14:28:17.000000000
+0100
@@ -1,11 +1,15 @@
opam-version: "2.0"
-maintainer: "Sylvain Le Gall <sylvaini+oc...@le-gall.net>"
-authors: [ "Sylvain Le Gall" ]
+synopsis: "This is a transition package, ounit-lwt is now ounit2-lwt"
+description: """
+More details for the transition:
+https://github.com/gildor478/ounit#transition-to-ounit2
+"""
+maintainer: ["Sylvain Le Gall <sylvaini+oc...@le-gall.net>"]
+authors: ["Sylvain Le Gall"]
+license: "MIT"
homepage: "https://github.com/gildor478/ounit";
-dev-repo: "git+https://github.com/gildor478/ounit.git";
+doc: "https://gildor478.github.io/ounit";
bug-reports: "https://github.com/gildor478/ounit/issues";
-doc: "https://gildor478.github.io/ounit/";
-license: "MIT"
depends: [
"ocamlfind" {build}
"ounit2-lwt" {= version}
@@ -13,8 +17,4 @@
install: [
[make "install-ounit-lwt" "version=%{version}%"]
]
-synopsis: "This is a transition package, ounit-lwt is now ounit2-lwt"
-description:"""
-More details for the transition:
-https://github.com/gildor478/ounit#transition-to-ounit2
-"""
+dev-repo: "git+https://github.com/gildor478/ounit.git";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-ounit-2.2.6/ounit.opam
new/ocaml-ounit-2.2.7/ounit.opam
--- old/ocaml-ounit-2.2.6/ounit.opam 2022-02-08 19:14:15.000000000 +0100
+++ new/ocaml-ounit-2.2.7/ounit.opam 2023-03-22 14:28:17.000000000 +0100
@@ -1,11 +1,15 @@
opam-version: "2.0"
-maintainer: "Sylvain Le Gall <sylvaini+oc...@le-gall.net>"
-authors: [ "Maas-Maarten Zeeman" "Sylvain Le Gall" ]
+synopsis: "This is a transition package, ounit-lwt is now ounit2-lwt"
+description: """
+More details for the transition:
+https://github.com/gildor478/ounit#transition-to-ounit2
+"""
+maintainer: ["Sylvain Le Gall <sylvaini+oc...@le-gall.net>"]
+authors: ["Sylvain Le Gall"]
+license: "MIT"
homepage: "https://github.com/gildor478/ounit";
-dev-repo: "git+https://github.com/gildor478/ounit.git";
+doc: "https://gildor478.github.io/ounit";
bug-reports: "https://github.com/gildor478/ounit/issues";
-doc: "https://gildor478.github.io/ounit/";
-license: "MIT"
depends: [
"ocamlfind" {build}
"ounit2" {= version}
@@ -13,8 +17,4 @@
install: [
[make "install-ounit" "version=%{version}%"]
]
-synopsis: "This is a transition package, ounit is now ounit2"
-description:"""
-More details for the transition:
-https://github.com/gildor478/ounit#transition-to-ounit2
-"""
+dev-repo: "git+https://github.com/gildor478/ounit.git";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-ounit-2.2.6/ounit2-lwt.opam
new/ocaml-ounit-2.2.7/ounit2-lwt.opam
--- old/ocaml-ounit-2.2.6/ounit2-lwt.opam 2022-02-08 19:14:15.000000000
+0100
+++ new/ocaml-ounit-2.2.7/ounit2-lwt.opam 2023-03-22 14:28:17.000000000
+0100
@@ -1,24 +1,33 @@
opam-version: "2.0"
-maintainer: "Sylvain Le Gall <sylvaini+oc...@le-gall.net>"
-authors: [ "Sylvain Le Gall" ]
+synopsis: "OUnit testing framework"
+description: """
+This library contains helper functions for building Lwt tests using OUnit.
+"""
+maintainer: ["Sylvain Le Gall <sylvaini+oc...@le-gall.net>"]
+authors: ["Sylvain Le Gall"]
+license: "MIT"
homepage: "https://github.com/gildor478/ounit";
-dev-repo: "git+https://github.com/gildor478/ounit.git";
+doc: "https://gildor478.github.io/ounit";
bug-reports: "https://github.com/gildor478/ounit/issues";
-doc: "https://gildor478.github.io/ounit/";
-license: "MIT"
depends: [
+ "dune" {>= "3.0"}
"ocaml" {>= "4.04.0"}
- "dune" {>= "1.11.0"}
- "lwt"
+ "lwt" {>= "2.5.2"}
"seq"
"ounit2" {= version}
+ "odoc" {with-doc}
]
build: [
- ["dune" "build" "-p" name "-j" jobs]
- ["dune" "runtest" "-p" name "-j" jobs] {with-test}
- ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc}
+ [
+ "dune"
+ "build"
+ "-p"
+ name
+ "-j"
+ jobs
+ "@install"
+ "@runtest" {with-test}
+ "@doc" {with-doc}
+ ]
]
-synopsis: "OUnit testing framework (Lwt)"
-description:"""
-This library contains helper functions for building Lwt tests using OUnit.
-"""
+dev-repo: "git+https://github.com/gildor478/ounit.git";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-ounit-2.2.6/ounit2.opam
new/ocaml-ounit-2.2.7/ounit2.opam
--- old/ocaml-ounit-2.2.6/ounit2.opam 2022-02-08 19:14:15.000000000 +0100
+++ new/ocaml-ounit-2.2.7/ounit2.opam 2023-03-22 14:28:17.000000000 +0100
@@ -1,28 +1,36 @@
opam-version: "2.0"
-maintainer: "Sylvain Le Gall <sylvaini+oc...@le-gall.net>"
-authors: [ "Maas-Maarten Zeeman" "Sylvain Le Gall" ]
+synopsis: "OUnit testing framework"
+description: """
+OUnit is a unit test framework for OCaml. It allows one to easily
+create unit-tests for OCaml code. It is loosely based on [HUnit], a
+unit testing framework for Haskell. It is similar to [JUnit], and
+other XUnit testing frameworks.
+"""
+maintainer: ["Sylvain Le Gall <sylvaini+oc...@le-gall.net>"]
+authors: ["Maas-Maarten Zeeman" "Sylvain Le Gall"]
+license: "MIT"
homepage: "https://github.com/gildor478/ounit";
-dev-repo: "git+https://github.com/gildor478/ounit.git";
+doc: "https://gildor478.github.io/ounit";
bug-reports: "https://github.com/gildor478/ounit/issues";
-doc: "https://gildor478.github.io/ounit/";
-license: "MIT"
depends: [
+ "dune" {>= "3.0"}
"ocaml" {>= "4.04.0"}
- "dune" {>= "1.11.0"}
- "base-bytes"
"base-unix"
"seq"
"stdlib-shims"
+ "odoc" {with-doc}
]
build: [
- ["dune" "build" "-p" name "-j" jobs]
- ["dune" "runtest" "-p" name "-j" jobs] {with-test}
- ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc}
+ [
+ "dune"
+ "build"
+ "-p"
+ name
+ "-j"
+ jobs
+ "@install"
+ "@runtest" {with-test}
+ "@doc" {with-doc}
+ ]
]
-synopsis: "OUnit testing framework"
-description: """
-OUnit is a unit test framework for OCaml. It allows one to easily create
-unit-tests for OCaml code. It is loosely based on [HUnit], a unit testing
-framework for Haskell. It is similar to [JUnit], and other XUnit testing
-frameworks.
-"""
+dev-repo: "git+https://github.com/gildor478/ounit.git";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-ounit-2.2.6/src/lib/oUnit/dune
new/ocaml-ounit-2.2.7/src/lib/oUnit/dune
--- old/ocaml-ounit-2.2.6/src/lib/oUnit/dune 2022-02-08 19:14:15.000000000
+0100
+++ new/ocaml-ounit-2.2.7/src/lib/oUnit/dune 2023-03-22 14:28:17.000000000
+0100
@@ -1,3 +1,3 @@
(documentation
- (package ounit)
- (mld_files index))
+ (package ounit)
+ (mld_files index))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-ounit-2.2.6/src/lib/ounit-lwt/dune
new/ocaml-ounit-2.2.7/src/lib/ounit-lwt/dune
--- old/ocaml-ounit-2.2.6/src/lib/ounit-lwt/dune 2022-02-08
19:14:15.000000000 +0100
+++ new/ocaml-ounit-2.2.7/src/lib/ounit-lwt/dune 2023-03-22
14:28:17.000000000 +0100
@@ -1,3 +1,3 @@
(documentation
- (package ounit-lwt)
- (mld_files index))
+ (package ounit-lwt)
+ (mld_files index))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-ounit-2.2.6/src/lib/ounit2/advanced/dune
new/ocaml-ounit-2.2.7/src/lib/ounit2/advanced/dune
--- old/ocaml-ounit-2.2.6/src/lib/ounit2/advanced/dune 2022-02-08
19:14:15.000000000 +0100
+++ new/ocaml-ounit-2.2.7/src/lib/ounit2/advanced/dune 2023-03-22
14:28:17.000000000 +0100
@@ -1,10 +1,14 @@
(rule
- (target oUnitLoggerHTMLData.ml)
- (deps (:data_gen ../../../tools/data_gen/data_gen.exe) oUnit.css oUnit.js)
- (action (run %{data_gen})))
+ (target oUnitLoggerHTMLData.ml)
+ (deps
+ (:data_gen ../../../tools/data_gen/data_gen.exe)
+ oUnit.css
+ oUnit.js)
+ (action
+ (run %{data_gen})))
(library
- (name oUnitAdvanced)
- (public_name ounit2.advanced)
- (wrapped false)
- (libraries unix bytes seq stdlib-shims))
+ (name oUnitAdvanced)
+ (public_name ounit2.advanced)
+ (wrapped false)
+ (libraries unix seq stdlib-shims))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ocaml-ounit-2.2.6/src/lib/ounit2/advanced/oUnitAssert.ml
new/ocaml-ounit-2.2.7/src/lib/ounit2/advanced/oUnitAssert.ml
--- old/ocaml-ounit-2.2.6/src/lib/ounit2/advanced/oUnitAssert.ml
2022-02-08 19:14:15.000000000 +0100
+++ new/ocaml-ounit-2.2.7/src/lib/ounit2/advanced/oUnitAssert.ml
2023-03-22 14:28:17.000000000 +0100
@@ -50,9 +50,10 @@
let assert_string str =
if not (str = "") then assert_failure str
-(* TODO: Use Seq.forever from OCaml >= 4.14 *)
-let rec seq_forever f () =
- Seq.Cons (f(), seq_forever f)
+let rec seq_of_channel channel () =
+ match input_char channel with
+ | exception End_of_file -> Seq.Nil
+ | char -> Seq.Cons (char, seq_of_channel channel)
let assert_equal ?ctxt ?(cmp = ( = )) ?printer ?pp_diff ?msg expected actual =
let get_error_string () =
@@ -292,7 +293,7 @@
in
(* Dump process output to stderr *)
begin
- let chn = open_in fn_out in
+ let chn = open_in_bin fn_out in
let buff = Bytes.make 4096 'X' in
let len = ref (-1) in
while !len <> 0 do
@@ -314,9 +315,9 @@
real_exit_code;
begin
- let chn = open_in fn_out in
+ let chn = open_in_bin fn_out in
try
- foutput (seq_forever (fun () -> input_char chn))
+ foutput (seq_of_channel chn)
with e ->
close_in chn;
raise e
@@ -351,4 +352,3 @@
| Some e ->
assert_equal ?msg ~printer:pexn exn e
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ocaml-ounit-2.2.6/src/lib/ounit2/advanced/oUnitCache.ml
new/ocaml-ounit-2.2.7/src/lib/ounit2/advanced/oUnitCache.ml
--- old/ocaml-ounit-2.2.6/src/lib/ounit2/advanced/oUnitCache.ml 2022-02-08
19:14:15.000000000 +0100
+++ new/ocaml-ounit-2.2.7/src/lib/ounit2/advanced/oUnitCache.ml 2023-03-22
14:28:17.000000000 +0100
@@ -48,7 +48,7 @@
| Some fn ->
begin
try
- let chn = open_in fn in
+ let chn = open_in_bin fn in
let cache : cache =
try
Marshal.from_channel chn
@@ -69,7 +69,7 @@
| Some fn ->
begin
try
- let chn = open_out fn in
+ let chn = open_out_bin fn in
Marshal.to_channel chn cache [];
close_out chn
with _ ->
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ocaml-ounit-2.2.6/src/lib/ounit2/advanced/oUnitConf.ml
new/ocaml-ounit-2.2.7/src/lib/ounit2/advanced/oUnitConf.ml
--- old/ocaml-ounit-2.2.6/src/lib/ounit2/advanced/oUnitConf.ml 2022-02-08
19:14:15.000000000 +0100
+++ new/ocaml-ounit-2.2.7/src/lib/ounit2/advanced/oUnitConf.ml 2023-03-22
14:28:17.000000000 +0100
@@ -309,7 +309,7 @@
try
Scanf.sscanf str "%s = %s" (fun name value -> name, value)
with Scanf.Scan_failure _ ->
- failwithf "Unparseable line: %s\n%s" line origin
+ failwithf "Unparsable line: %s\n%s" line origin
end
in
set ~origin conf name value
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ocaml-ounit-2.2.6/src/lib/ounit2/advanced/oUnitLoggerStd.ml
new/ocaml-ounit-2.2.7/src/lib/ounit2/advanced/oUnitLoggerStd.ml
--- old/ocaml-ounit-2.2.6/src/lib/ounit2/advanced/oUnitLoggerStd.ml
2022-02-08 19:14:15.000000000 +0100
+++ new/ocaml-ounit-2.2.7/src/lib/ounit2/advanced/oUnitLoggerStd.ml
2023-03-22 14:28:17.000000000 +0100
@@ -211,7 +211,7 @@
| GStart -> ispf "Start testing."
| GEnd -> ispf "End testing."
| GResults (running_time, results, test_case_count) ->
- let countr = count results in
+ let counter = count results in
ispf "==============";
ispf "Summary:";
List.iter
@@ -223,11 +223,11 @@
(List.length results) running_time;
ispf "Cases: %d." test_case_count;
ispf "Tried: %d." (List.length results);
- ispf "Errors: %d." (countr is_error);
- ispf "Failures: %d." (countr is_failure);
- ispf "Skip: %d." (countr is_skip);
- ispf "Todo: %d." (countr is_todo);
- ispf "Timeout: %d." (countr is_timeout)
+ ispf "Errors: %d." (counter is_error);
+ ispf "Failures: %d." (counter is_failure);
+ ispf "Skip: %d." (counter is_skip);
+ ispf "Todo: %d." (counter is_todo);
+ ispf "Timeout: %d." (counter is_timeout)
end
| TestEvent (path, e) ->
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-ounit-2.2.6/src/lib/ounit2/dune
new/ocaml-ounit-2.2.7/src/lib/ounit2/dune
--- old/ocaml-ounit-2.2.6/src/lib/ounit2/dune 2022-02-08 19:14:15.000000000
+0100
+++ new/ocaml-ounit-2.2.7/src/lib/ounit2/dune 2023-03-22 14:28:17.000000000
+0100
@@ -1,9 +1,9 @@
(library
- (name oUnit)
- (public_name ounit2)
- (wrapped false)
- (libraries unix seq ounit2.advanced))
+ (name oUnit)
+ (public_name ounit2)
+ (wrapped false)
+ (libraries unix seq ounit2.advanced))
(documentation
- (package ounit2)
- (mld_files index))
+ (package ounit2)
+ (mld_files index))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-ounit-2.2.6/src/lib/ounit2/oUnit.mli
new/ocaml-ounit-2.2.7/src/lib/ounit2/oUnit.mli
--- old/ocaml-ounit-2.2.6/src/lib/ounit2/oUnit.mli 2022-02-08
19:14:15.000000000 +0100
+++ new/ocaml-ounit-2.2.7/src/lib/ounit2/oUnit.mli 2023-03-22
14:28:17.000000000 +0100
@@ -234,7 +234,7 @@
val string_of_node : node -> string
(** Make a string from a path. The path will be reversed before it is
- tranlated into a string *)
+ translated into a string *)
val string_of_path : path -> string
(** Returns a list with paths of the test *)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-ounit-2.2.6/src/lib/ounit2/threads/dune
new/ocaml-ounit-2.2.7/src/lib/ounit2/threads/dune
--- old/ocaml-ounit-2.2.6/src/lib/ounit2/threads/dune 2022-02-08
19:14:15.000000000 +0100
+++ new/ocaml-ounit-2.2.7/src/lib/ounit2/threads/dune 2023-03-22
14:28:17.000000000 +0100
@@ -1,5 +1,5 @@
(library
- (name oUnitThreads)
- (public_name ounit2.threads)
- (private_modules oUnitRunnerThreads)
- (libraries threads ounit2))
+ (name oUnitThreads)
+ (public_name ounit2.threads)
+ (private_modules oUnitRunnerThreads)
+ (libraries threads ounit2))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-ounit-2.2.6/src/lib/ounit2-lwt/dune
new/ocaml-ounit-2.2.7/src/lib/ounit2-lwt/dune
--- old/ocaml-ounit-2.2.6/src/lib/ounit2-lwt/dune 2022-02-08
19:14:15.000000000 +0100
+++ new/ocaml-ounit-2.2.7/src/lib/ounit2-lwt/dune 2023-03-22
14:28:17.000000000 +0100
@@ -1,4 +1,4 @@
(library
- (name oUnitLwt)
- (public_name ounit2-lwt)
- (libraries lwt lwt.unix ounit2.advanced))
+ (name oUnitLwt)
+ (public_name ounit2-lwt)
+ (libraries lwt lwt.unix ounit2.advanced))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-ounit-2.2.6/src/tools/data_gen/data_gen.ml
new/ocaml-ounit-2.2.7/src/tools/data_gen/data_gen.ml
--- old/ocaml-ounit-2.2.6/src/tools/data_gen/data_gen.ml 2022-02-08
19:14:15.000000000 +0100
+++ new/ocaml-ounit-2.2.7/src/tools/data_gen/data_gen.ml 2023-03-22
14:28:17.000000000 +0100
@@ -1,5 +1,5 @@
let file_to_string f =
- let chan = open_in f in
+ let chan = open_in_bin f in
let len = in_channel_length chan in
let res = Bytes.create len in
really_input chan res 0 len;
@@ -10,7 +10,7 @@
let css = file_to_string "oUnit.css" in
let js = file_to_string "oUnit.js" in
- let chan = open_out "oUnitLoggerHTMLData.ml" in
+ let chan = open_out_bin "oUnitLoggerHTMLData.ml" in
Printf.fprintf chan
"let oUnit_css = %S;;
let oUnit_js = %S;;"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-ounit-2.2.6/src/tools/data_gen/dune
new/ocaml-ounit-2.2.7/src/tools/data_gen/dune
--- old/ocaml-ounit-2.2.6/src/tools/data_gen/dune 2022-02-08
19:14:15.000000000 +0100
+++ new/ocaml-ounit-2.2.7/src/tools/data_gen/dune 2023-03-22
14:28:17.000000000 +0100
@@ -1,2 +1,2 @@
(executable
- (name data_gen))
+ (name data_gen))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-ounit-2.2.6/test/JUnit.xsd
new/ocaml-ounit-2.2.7/test/JUnit.xsd
--- old/ocaml-ounit-2.2.6/test/JUnit.xsd 2022-02-08 19:14:15.000000000
+0100
+++ new/ocaml-ounit-2.2.7/test/JUnit.xsd 2023-03-22 14:28:17.000000000
+0100
@@ -85,7 +85,7 @@
</xs:attribute>
<xs:attribute name="type" type="xs:string" use="required">
<xs:annotation>
- <xs:documentation xml:lang="en">The type of error that
occured. e.g., if a java execption is thrown the full class name of the
exception.</xs:documentation>
+ <xs:documentation xml:lang="en">The type of error that
occurred. e.g., if a java exception is thrown the full class name of the
exception.</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:extension>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-ounit-2.2.6/test/common/dune
new/ocaml-ounit-2.2.7/test/common/dune
--- old/ocaml-ounit-2.2.6/test/common/dune 2022-02-08 19:14:15.000000000
+0100
+++ new/ocaml-ounit-2.2.7/test/common/dune 2023-03-22 14:28:17.000000000
+0100
@@ -1,6 +1,8 @@
(library
- (name testcommon)
- (modules testCommonRunner segfault)
- (c_names segfault)
- (wrapped false)
- (libraries ounit2 ounit2.advanced))
+ (name testcommon)
+ (modules testCommonRunner segfault)
+ (foreign_stubs
+ (names segfault)
+ (language c))
+ (wrapped false)
+ (libraries ounit2 ounit2.advanced))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-ounit-2.2.6/test/dune
new/ocaml-ounit-2.2.7/test/dune
--- old/ocaml-ounit-2.2.6/test/dune 2022-02-08 19:14:15.000000000 +0100
+++ new/ocaml-ounit-2.2.7/test/dune 2023-03-22 14:28:17.000000000 +0100
@@ -1,14 +1,22 @@
(test
- (name test)
- (libraries ounit2 ounit2.advanced str libtest)
- (package ounit2)
- (deps
- test.exe
- (:fakeHTML fakeHTML/fakeHTML.exe)
- (:fakeRunner fakeRunner/fakeRunner.exe)
- (:fakeShared fakeShared/fakeShared.exe)
- (:fakeBadFinaliser fakeBadFinaliser/fakeBadFinaliser.exe)
- JUnit.xsd)
- (action
- (run %{test} -fakeHTML %{fakeHTML} -fakeRunner %{fakeRunner}
- -fakeShared %{fakeShared} -fakeBadFinaliser %{fakeBadFinaliser})))
+ (name test)
+ (libraries ounit2 ounit2.advanced str libtest)
+ (package ounit2)
+ (deps
+ test.exe
+ (:fakeHTML fakeHTML/fakeHTML.exe)
+ (:fakeRunner fakeRunner/fakeRunner.exe)
+ (:fakeShared fakeShared/fakeShared.exe)
+ (:fakeBadFinaliser fakeBadFinaliser/fakeBadFinaliser.exe)
+ JUnit.xsd)
+ (action
+ (run
+ %{test}
+ -fakeHTML
+ %{fakeHTML}
+ -fakeRunner
+ %{fakeRunner}
+ -fakeShared
+ %{fakeShared}
+ -fakeBadFinaliser
+ %{fakeBadFinaliser})))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-ounit-2.2.6/test/fakeBadFinaliser/dune
new/ocaml-ounit-2.2.7/test/fakeBadFinaliser/dune
--- old/ocaml-ounit-2.2.6/test/fakeBadFinaliser/dune 2022-02-08
19:14:15.000000000 +0100
+++ new/ocaml-ounit-2.2.7/test/fakeBadFinaliser/dune 2023-03-22
14:28:17.000000000 +0100
@@ -1,3 +1,3 @@
(executable
- (name fakeBadFinaliser)
- (libraries ounit2 testcommon))
+ (name fakeBadFinaliser)
+ (libraries ounit2 testcommon))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-ounit-2.2.6/test/fakeHTML/dune
new/ocaml-ounit-2.2.7/test/fakeHTML/dune
--- old/ocaml-ounit-2.2.6/test/fakeHTML/dune 2022-02-08 19:14:15.000000000
+0100
+++ new/ocaml-ounit-2.2.7/test/fakeHTML/dune 2023-03-22 14:28:17.000000000
+0100
@@ -1,3 +1,3 @@
(executable
- (name fakeHTML)
- (libraries ounit2))
+ (name fakeHTML)
+ (libraries ounit2))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-ounit-2.2.6/test/fakeRunner/dune
new/ocaml-ounit-2.2.7/test/fakeRunner/dune
--- old/ocaml-ounit-2.2.6/test/fakeRunner/dune 2022-02-08 19:14:15.000000000
+0100
+++ new/ocaml-ounit-2.2.7/test/fakeRunner/dune 2023-03-22 14:28:17.000000000
+0100
@@ -1,3 +1,3 @@
(executable
- (name fakeRunner)
- (libraries ounit2 ounit2.threads testcommon))
+ (name fakeRunner)
+ (libraries ounit2 ounit2.threads testcommon))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-ounit-2.2.6/test/fakeShared/dune
new/ocaml-ounit-2.2.7/test/fakeShared/dune
--- old/ocaml-ounit-2.2.6/test/fakeShared/dune 2022-02-08 19:14:15.000000000
+0100
+++ new/ocaml-ounit-2.2.7/test/fakeShared/dune 2023-03-22 14:28:17.000000000
+0100
@@ -1,3 +1,3 @@
(executable
- (name fakeShared)
- (libraries ounit2 ounit2.threads))
+ (name fakeShared)
+ (libraries ounit2 ounit2.threads))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-ounit-2.2.6/test/libtest/dune
new/ocaml-ounit-2.2.7/test/libtest/dune
--- old/ocaml-ounit-2.2.6/test/libtest/dune 2022-02-08 19:14:15.000000000
+0100
+++ new/ocaml-ounit-2.2.7/test/libtest/dune 2023-03-22 14:28:17.000000000
+0100
@@ -1,4 +1,4 @@
(library
- (name libtest)
- (wrapped false)
- (libraries ounit2 ounit2.advanced testcommon))
+ (name libtest)
+ (wrapped false)
+ (libraries str ounit2 ounit2.advanced testcommon))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-ounit-2.2.6/test/lwt/dune
new/ocaml-ounit-2.2.7/test/lwt/dune
--- old/ocaml-ounit-2.2.6/test/lwt/dune 2022-02-08 19:14:15.000000000 +0100
+++ new/ocaml-ounit-2.2.7/test/lwt/dune 2023-03-22 14:28:17.000000000 +0100
@@ -1,4 +1,4 @@
(test
- (name test)
- (package ounit2-lwt)
- (libraries ounit2 ounit2-lwt testcommon))
+ (name test)
+ (package ounit2-lwt)
+ (libraries ounit2 ounit2-lwt testcommon))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-ounit-2.2.6/test/lwt/testRunnerProcesses/dune
new/ocaml-ounit-2.2.7/test/lwt/testRunnerProcesses/dune
--- old/ocaml-ounit-2.2.6/test/lwt/testRunnerProcesses/dune 2022-02-08
19:14:15.000000000 +0100
+++ new/ocaml-ounit-2.2.7/test/lwt/testRunnerProcesses/dune 2023-03-22
14:28:17.000000000 +0100
@@ -1,6 +1,9 @@
(test
- (name testRunnerProcesses)
- (package ounit2-lwt)
- (deps test.txt)
- (libraries ounit2 lwt lwt.unix ounit2-lwt)
- (action (run %{test} -runner processes)))
+ (name testRunnerProcesses)
+ (package ounit2-lwt)
+ (deps test.txt)
+ (libraries ounit2 lwt lwt.unix ounit2-lwt)
+ (enabled_if
+ (<> %{os_type} Win32))
+ (action
+ (run %{test} -runner processes)))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-ounit-2.2.6/test/test_byte/dune
new/ocaml-ounit-2.2.7/test/test_byte/dune
--- old/ocaml-ounit-2.2.6/test/test_byte/dune 2022-02-08 19:14:15.000000000
+0100
+++ new/ocaml-ounit-2.2.7/test/test_byte/dune 2023-03-22 14:28:17.000000000
+0100
@@ -1,8 +1,5 @@
(test
- (name test_byte)
- (libraries ounit2 ounit2.advanced str libtest)
- (package ounit2)
- (modes byte)
- (deps test_byte.bc)
- (action (run %{test})))
-
+ (name test_byte)
+ (libraries ounit2 ounit2.advanced str libtest)
+ (package ounit2)
+ (modes exe shared_object))
