* [bug#62796] [PATCH core-updates] gnu: ocaml-ppxlib: Fix tests.
@ 2023-04-12 16:00 Simon Tournier
2023-04-12 17:08 ` Simon Tournier
2023-04-12 17:09 ` [bug#62796] [PATCH core-updates v2 1/2] " Simon Tournier
0 siblings, 2 replies; 5+ messages in thread
From: Simon Tournier @ 2023-04-12 16:00 UTC (permalink / raw)
To: 62796; +Cc: Simon Tournier, pukkamustard, julien, andreas
* gnu/packages/ocaml.scm (ocaml-ppxlib)[arguments]: Substitue obsolete 'egrep'
by 'grep -E'.
---
gnu/packages/ocaml.scm | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
Hi,
This fixes a regression when updating grep.
Cheers,
simon
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index c6dca2874f..f1c4e35044 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -6660,7 +6660,12 @@ (define-public ocaml-ppxlib
(substitute* "test/ppx_import_support/test.ml"
(("\\(Failure") "Failure")
((" \"(Some ppx-es.*)\")" _ m)
- (string-append " \"" m "\"."))))))))
+ (string-append " \"" m "\".")))))
+ (add-after 'fix-test-format 'fix-egrep
+ (lambda _
+ ;; egrep is obsolescent; using grep -E
+ (substitute* "test/expansion_context/run.t"
+ (("egrep") "grep -E")))))))
(propagated-inputs
(list ocaml-compiler-libs
ocaml-ppx-derivers
base-commit: a3bfb867380f1e5ce157334d7d9877297ef509ab
--
2.38.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#62796] [PATCH core-updates] gnu: ocaml-ppxlib: Fix tests.
2023-04-12 16:00 [bug#62796] [PATCH core-updates] gnu: ocaml-ppxlib: Fix tests Simon Tournier
@ 2023-04-12 17:08 ` Simon Tournier
2023-04-12 17:09 ` [bug#62796] [PATCH core-updates v2 1/2] " Simon Tournier
1 sibling, 0 replies; 5+ messages in thread
From: Simon Tournier @ 2023-04-12 17:08 UTC (permalink / raw)
To: 62796; +Cc: pukkamustard, julien, andreas
Hi,
On mer., 12 avril 2023 at 18:00, Simon Tournier <zimon.toutoune@gmail.com> wrote:
> This fixes a regression when updating grep.
The other affected package is ocaml-mdx, fixed by [PATCH v2] send to
patch#62796.
Considering these 2 patches, the OCaml packages in core-updates build
fine. Except ocaml-uring with the error:
--8<---------------cut here---------------start------------->8---
# let `Timeout, timeout = consume t;;
-val timeout : int = -62
+val timeout : int = -22
--8<---------------cut here---------------end--------------->8---
Well, the errno -62 is expected and corresponds to -ETIME from Linux
kernel documentation. All documented in tests/main.md of the package
ocaml-uring,
--8<---------------cut here---------------start------------->8---
## Timeout
Timeout should return (-ETIME). This is defined in https://github.com/torvalds/linux/blob/master/include/uapi/asm-generic/errno.h#L45
```ocaml
[...]
# let `Timeout, timeout = consume t;;
val timeout : int = -62
--8<---------------cut here---------------end--------------->8---
And I do not understand why this -22 (EINVAL Invalid argument). Any
idea?
Cheers,
simon
^ permalink raw reply [flat|nested] 5+ messages in thread
* [bug#62796] [PATCH core-updates v2 1/2] gnu: ocaml-ppxlib: Fix tests.
2023-04-12 16:00 [bug#62796] [PATCH core-updates] gnu: ocaml-ppxlib: Fix tests Simon Tournier
2023-04-12 17:08 ` Simon Tournier
@ 2023-04-12 17:09 ` Simon Tournier
2023-04-12 17:09 ` [bug#62796] [PATCH core-updates v2 2/2] gnu: ocaml-mdx: " Simon Tournier
1 sibling, 1 reply; 5+ messages in thread
From: Simon Tournier @ 2023-04-12 17:09 UTC (permalink / raw)
To: 62796; +Cc: Simon Tournier
* gnu/packages/ocaml.scm (ocaml-ppxlib)[arguments]: Substitue obsolete 'egrep'
by 'grep -E'.
---
gnu/packages/ocaml.scm | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index c6dca2874f..f1c4e35044 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -6660,7 +6660,12 @@ (define-public ocaml-ppxlib
(substitute* "test/ppx_import_support/test.ml"
(("\\(Failure") "Failure")
((" \"(Some ppx-es.*)\")" _ m)
- (string-append " \"" m "\"."))))))))
+ (string-append " \"" m "\".")))))
+ (add-after 'fix-test-format 'fix-egrep
+ (lambda _
+ ;; egrep is obsolescent; using grep -E
+ (substitute* "test/expansion_context/run.t"
+ (("egrep") "grep -E")))))))
(propagated-inputs
(list ocaml-compiler-libs
ocaml-ppx-derivers
base-commit: a3bfb867380f1e5ce157334d7d9877297ef509ab
--
2.38.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#62796] [PATCH core-updates v2 2/2] gnu: ocaml-mdx: Fix tests.
2023-04-12 17:09 ` [bug#62796] [PATCH core-updates v2 1/2] " Simon Tournier
@ 2023-04-12 17:09 ` Simon Tournier
2023-04-12 19:54 ` bug#62796: " Julien Lepiller
0 siblings, 1 reply; 5+ messages in thread
From: Simon Tournier @ 2023-04-12 17:09 UTC (permalink / raw)
To: 62796; +Cc: Simon Tournier
* gnu/packages/ocaml.scm (ocaml-mdx)[arguments]: Substitue obsolete 'egrep' by
'grep -E'.
---
gnu/packages/ocaml.scm | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index f1c4e35044..b462d315e1 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -9230,7 +9230,12 @@ (define-public ocaml-mdx
"test/bin/mdx-test/misc/no-such-prelude/test.expected")
(("`") "'")
(("COMMAND") "[COMMAND]")
- (("\\.\\.\\.") "…")))))))
+ (("\\.\\.\\.") "…"))))
+ (add-after 'fix-test-format 'fix-egrep
+ (lambda _
+ ;; egrep is obsolescent; using grep -E
+ (substitute* "test/bin/mdx-test/expect/padding/test-case.md"
+ (("egrep") "grep -E")))))))
(propagated-inputs
(list ocaml-fmt
ocaml-astring
--
2.38.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* bug#62796: [PATCH core-updates v2 2/2] gnu: ocaml-mdx: Fix tests.
2023-04-12 17:09 ` [bug#62796] [PATCH core-updates v2 2/2] gnu: ocaml-mdx: " Simon Tournier
@ 2023-04-12 19:54 ` Julien Lepiller
0 siblings, 0 replies; 5+ messages in thread
From: Julien Lepiller @ 2023-04-12 19:54 UTC (permalink / raw)
To: Simon Tournier; +Cc: 62796-done
Pushed to core-updates as 8557eb9ffb909d5df8aba5ca1c444f23f083d7e9 and
a957171bc41e98e29674f99cf3dd2940ff45a0d3, thanks!
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-04-12 19:56 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-12 16:00 [bug#62796] [PATCH core-updates] gnu: ocaml-ppxlib: Fix tests Simon Tournier
2023-04-12 17:08 ` Simon Tournier
2023-04-12 17:09 ` [bug#62796] [PATCH core-updates v2 1/2] " Simon Tournier
2023-04-12 17:09 ` [bug#62796] [PATCH core-updates v2 2/2] gnu: ocaml-mdx: " Simon Tournier
2023-04-12 19:54 ` bug#62796: " Julien Lepiller
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).