[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][ocaml-team/ocaml-re][master] 2 commits: Fix autopkgtest



Title: GitLab

Stéphane Glondu pushed to branch master at Debian OCaml Maintainers / ocaml-re

Commits:

  • 5d083615
    by Stephane Glondu at 2025-08-29T11:52:05+02:00
    Fix autopkgtest
    
  • 3fdfdfc3
    by Stephane Glondu at 2025-08-29T11:52:05+02:00
    Update changelog and prepare upload to unstable
    

5 changed files:

Changes:

  • debian/changelog
    1
    +ocaml-re (1.13.3-4) unstable; urgency=medium
    
    2
    +
    
    3
    +  * Team upload
    
    4
    +  * Fix autopkgtest
    
    5
    +
    
    6
    + -- Stéphane Glondu <glondu@debian.org>  Fri, 29 Aug 2025 11:47:56 +0200
    
    7
    +
    
    1 8
     ocaml-re (1.13.3-3) unstable; urgency=medium
    
    2 9
     
    
    3 10
       * Team upload
    

  • debian/patches/0001-Fix-splitting-the-empty-string.patch
    ... ... @@ -4,8 +4,9 @@ Subject: Fix splitting the empty string
    4 4
     
    
    5 5
     Bug: https://github.com/ocaml/ocaml-re/issues/584
    
    6 6
     ---
    
    7
    - lib/pcre.ml | 2 +-
    
    8
    - 1 file changed, 1 insertion(+), 1 deletion(-)
    
    7
    + lib/pcre.ml                      | 2 +-
    
    8
    + lib_test/expect/test_pcre_288.ml | 2 +-
    
    9
    + 2 files changed, 2 insertions(+), 2 deletions(-)
    
    9 10
     
    
    10 11
     diff --git a/lib/pcre.ml b/lib/pcre.ml
    
    11 12
     index 6287594..1772aca 100644
    
    ... ... @@ -20,3 +21,16 @@ index 6287594..1772aca 100644
    20 21
      ;;
    
    21 22
      
    
    22 23
      (* From PCRE *)
    
    24
    +diff --git a/lib_test/expect/test_pcre_288.ml b/lib_test/expect/test_pcre_288.ml
    
    25
    +index 30ae0d4..a6d08ee 100644
    
    26
    +--- a/lib_test/expect/test_pcre_288.ml
    
    27
    ++++ b/lib_test/expect/test_pcre_288.ml
    
    28
    +@@ -5,7 +5,7 @@ let whitespace_re = Pcre.regexp "\\s+"
    
    29
    + 
    
    30
    + let%expect_test "split1" =
    
    31
    +   strings (Pcre.split ~rex:whitespace_re "");
    
    32
    +-  [%expect {| [""] |}]
    
    33
    ++  [%expect {| [] |}]
    
    34
    + ;;
    
    35
    + 
    
    36
    + let%expect_test "split2" =

  • debian/tests/control
    1 1
     Tests: tests
    
    2
    -Depends: @, ocaml, ocaml-dune, libounit-ocaml-dev
    2
    +Depends: @, ocaml, ocaml-dune, libounit-ocaml-dev, libppx-inline-test-ocaml-dev, libppx-expect-ocaml-dev, js-of-ocaml, nodejs

  • debian/tests/dune-project
    1
    -(lang dune 2.0)
    
    1
    +(lang dune 3.12)
    
    2 2
     (name re-tests)

  • debian/tests/tests
    1
    -#!/bin/sh
    
    1
    +#!/bin/bash
    
    2 2
     
    
    3 3
     set -e
    
    4 4
     
    
    ... ... @@ -7,9 +7,9 @@ mkdir -p ${outdir}
    7 7
     
    
    8 8
     cp -a lib_test ${outdir}
    
    9 9
     cp debian/tests/dune-project ${outdir}/lib_test/
    
    10
    -cp lib/fmt.ml ${outdir}/lib_test/fort_unit/
    
    10
    +mkdir -p ${outdir}/lib_test/lib/
    
    11
    +cp lib/*.{ml,mli} ${outdir}/lib_test/lib/
    
    11 12
     cd ${outdir}/lib_test
    
    12
    -sed -i '/fmt\.ml/d' fort_unit/dune
    
    13 13
     
    
    14 14
     echo "* Run tests"
    
    15 15
     dune runtest 2>&1


  • Reply to: