From 92b2bba08782099287b125acbbd583713d81ce3f Mon Sep 17 00:00:00 2001 From: Raja Boujbel Date: Tue, 12 Sep 2023 12:36:11 +0200 Subject: [PATCH] reftest: fix sed-cmd regexp to handle escaped '\' --- master_changes.md | 2 +- tests/reftests/run.ml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/master_changes.md b/master_changes.md index 10482a0b06a..2aeb2d1122d 100644 --- a/master_changes.md +++ b/master_changes.md @@ -111,7 +111,7 @@ users) ### Engine * With real path resolved for all opam temp dir, remove `/private` from mac temp dir regexp [#5654 @rjbou] - * Reimplement `sed-cmd` command regexp, to handle prefixed commands with path not only in subprocess, but anywere in output [#5657 @rjbou] + * Reimplement `sed-cmd` command regexp, to handle prefixed commands with path not only in subprocess, but anywere in output [#5657 #5607 @rjbou] ## Github Actions * Add coreutils install for cheksum validation tests [#5560 @rjbou] diff --git a/tests/reftests/run.ml b/tests/reftests/run.ml index 265face0f44..60814411ee9 100644 --- a/tests/reftests/run.ml +++ b/tests/reftests/run.ml @@ -468,8 +468,9 @@ module Parse = struct *) opt_quoted @@ [ alpha; char ':'; - rep1 @@ seq [ char '\\'; rep1 @@ diff any (with_quote_set "\\") ]; - char '\\'; + rep1 @@ seq [ char '\\'; opt @@ char '\\'; + rep1 @@ diff any (with_quote_set "\\") ]; + char '\\'; opt @@ char '\\'; Re.str cmd; opt @@ Re.str ".exe"; ] in