From 306c19068a318403c3a844807143145bee715327 Mon Sep 17 00:00:00 2001 From: Jay Mody Date: Wed, 12 Feb 2025 16:32:31 -0500 Subject: [PATCH] Use diff instead of patdiff in run-floating-attr.t to make CI pass. Signed-off-by: Jay Mody --- .../floating_attr/run-floating-attr.t | 44 +++++++------------ 1 file changed, 16 insertions(+), 28 deletions(-) diff --git a/test/extensions_and_deriving/floating_attr/run-floating-attr.t b/test/extensions_and_deriving/floating_attr/run-floating-attr.t index 92d6d83a..2d46e210 100644 --- a/test/extensions_and_deriving/floating_attr/run-floating-attr.t +++ b/test/extensions_and_deriving/floating_attr/run-floating-attr.t @@ -9,13 +9,10 @@ Test `attr_str_floating_expect` via `@@@identity_inline`. > end] > [@@@end] > EOF - $ ./ppx.exe -no-color -null program.ml - -program.ml - +program.ml.ppx-corrected - File "program.ml", line 7, characters 0-1: - [@@@identity_inline - module T : sig - val foo : [%str] + $ ./ppx.exe -no-color -null -diff-cmd 'diff -u --label "" --label ""' program.ml + --- + +++ + @@ -4,4 +4,6 @@ end = struct let foo = [%suffix "apples"] end] @@ -36,13 +33,10 @@ Test `attr_sig_floating_expect` via `@@@identity_inline`. > [@@@end] > end > EOF - $ ./ppx.exe -no-color -null program.ml - -program.ml - +program.ml.ppx-corrected - File "program.ml", line 7, characters 0-1: - module type S = sig - [@@@identity_inline: - val foo : [%str] + $ ./ppx.exe -no-color -null -diff-cmd 'diff -u --label "" --label ""' program.ml + --- + +++ + @@ -4,5 +4,8 @@ include module type of struct let foo = [%suffix "apples"] end] @@ -65,13 +59,10 @@ Test `attr_str_floating_expect_and_expand` via `@@@identity_inline_expanded`. > end] > [@@@end] > EOF - $ ./ppx.exe -no-color -null program.ml - -program.ml - +program.ml.ppx-corrected - File "program.ml", line 7, characters 0-1: - [@@@identity_inline_expanded - module T : sig - val foo : [%str] + $ ./ppx.exe -no-color -null -diff-cmd 'diff -u --label "" --label ""' program.ml + --- + +++ + @@ -4,4 +4,5 @@ end = struct let foo = [%suffix "apples"] end] @@ -91,13 +82,10 @@ Test `attr_sig_floating_expect_and_expand` via `@@@identity_inline_expanded`. > [@@@end] > end > EOF - $ ./ppx.exe -no-color -null program.ml - -program.ml - +program.ml.ppx-corrected - File "program.ml", line 7, characters 0-1: - module type S = sig - [@@@identity_inline_expanded: - val foo : [%str] + $ ./ppx.exe -no-color -null -diff-cmd 'diff -u --label "" --label ""' program.ml + --- + +++ + @@ -4,5 +4,8 @@ include module type of struct let foo = [%suffix "apples"] end]