AX_AT_DIFF_*(): add RUN-IF-(FAIL|PASS) support

Extend `AX_AT_DIFF_PATTERN()` and `AX_AT_DIFF_PYRE()` to support
optional `RUN-IF-FAIL` and `RUN-IF-PASS` arguments.

Author: lukem

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## [19] - unreleased
+
+### Changed
+- Extend `AX_AT_DIFF_PATTERN()` and `AX_AT_DIFF_PYRE()` to support
+- optional `RUN-IF-FAIL` and `RUN-IF-PASS` arguments.
+
 ## [18] - 2024-03-12
 
 ### Added

src/ax_at_check_pattern.m4

@@ -1,7 +1,7 @@
 # SYNOPSIS
 #
 #   AX_AT_CHECK_PATTERN(COMMANDS, [STATUS], [STDOUT-RE], [STDERR-RE], [RUN-IF-FAIL], [RUN-IF-PASS])
-#   AX_AT_DIFF_PATTERN(PATTERN-FILE, TEST-FILE, [STATUS=0], [DIFFERENCES])
+#   AX_AT_DIFF_PATTERN(PATTERN-FILE, TEST-FILE, [STATUS=0], [DIFFERENCES], [RUN-IF-FAIL], [RUN-IF-PASS])
 #   AX_AT_DATA_CHECK_PATTERN_AWK(FILENAME)
 #
 # DESCRIPTION
@@ -33,7 +33,7 @@
 #
 # LICENSE
 #
-#   Copyright (c) 2013-2023, Luke Mewburn <[email protected]>
+#   Copyright (c) 2013-2024, Luke Mewburn <[email protected]>
 #
 #   Copying and distribution of this file, with or without modification,
 #   are permitted in any medium without royalty provided the copyright
@@ -154,7 +154,7 @@ AT_CHECK(m4_expand([$1]), [$2], m4_expand([$3]), m4_expand([$4]),
 
 m4_defun([AX_AT_DIFF_PATTERN], [dnl
 AS_REQUIRE([_AX_AT_CHECK_PATTERN_PREPARE])
-AT_CHECK([ax_at_diff_pattern $1 $2], [$3], [$4])
+AT_CHECK([ax_at_diff_pattern $1 $2], [$3], m4_expand([$4]), [], m4_expand([$5]), m4_expand([$6]))
 ])dnl AX_AT_DIFF_PATTERN
 
 

src/ax_at_check_pyrediff.m4

@@ -1,7 +1,7 @@
 # SYNOPSIS
 #
 #   AX_AT_CHECK_PYREDIFF(COMMANDS, [STATUS], [STDOUT-RE], [STDERR-RE], [RUN-IF-FAIL], [RUN-IF-PASS])
-#   AX_AT_DIFF_PYRE(PYRE-FILE, TEST-FILE, [STATUS=0], [DIFFERENCES])
+#   AX_AT_DIFF_PYRE(PYRE-FILE, TEST-FILE, [STATUS=0], [DIFFERENCES], [RUN-IF-FAIL], [RUN-IF-PASS])
 #   AX_AT_DATA_PYREDIFF_PY(FILENAME)
 #
 # DESCRIPTION
@@ -247,7 +247,7 @@ AT_CHECK(m4_expand([$1]), [$2], m4_expand([$3]), m4_expand([$4]),
 
 m4_defun([AX_AT_DIFF_PYRE], [dnl
 AS_REQUIRE([_AX_AT_CHECK_PYRE_PREPARE])
-AT_CHECK([ax_at_diff_pyre $1 $2], [$3], [$4])
+AT_CHECK([ax_at_diff_pyre $1 $2], [$3], m4_expand([$4]), [], [$5], [$6])
 ])dnl AX_AT_DIFF_PYRE
 
 

tests/02-trivial.at

@@ -22,8 +22,14 @@ c
 ])
 
 AT_CHECK([echo ab; echo c], [0], [stdout])
+
 AX_AT_DIFF_PATTERN([02.re], [stdout])
 
+pass=false
+AX_AT_DIFF_PATTERN([02.re], [stdout], [0], [],
+ [echo unexpected mismatch], [pass=true])
+AT_CHECK([if $pass; then exit 0; else exit 99; fi])
+
 
 dnl
 dnl PYRE checks
@@ -42,6 +48,12 @@ c
 AT_CHECK([if $pass; then exit 0; else exit 99; fi])
 
 AT_CHECK([echo ab; echo c], [0], [stdout])
+
 AX_AT_DIFF_PYRE([02.re], [stdout])
 
+pass=false
+AX_AT_DIFF_PYRE([02.re], [stdout], [0], [],
+ [echo unexpected mismatch], [pass=true])
+AT_CHECK([if $pass; then exit 0; else exit 99; fi])
+
 AT_CLEANUP()

tests/04-trivial-bad.at

@@ -4,18 +4,45 @@ dnl
 dnl Also exercises RUN-IF-FAIL and RUN-IF-PASS support.
 dnl
 
+dnl
+dnl PATTERN checks
+dnl
+
 AX_AT_CHECK_PATTERN([echo ab; echo c], [0], [dnl
 ab?c?
 C
 ], [],
  [echo expected mismatch;at_failed=false],
  [echo unexpected match;at_failed=:])
 
+AT_DATA([04.re], [dnl
+ab?c?
+C
+])
+
+AT_CHECK([echo ab; echo c], [0], [stdout])
+
+AX_AT_DIFF_PATTERN([04.re], [stdout], [0], [],
+ [echo expected mismatch;at_failed=false],
+ [echo unexpected match;at_failed=:])
+
+
+dnl
+dnl PYRE checks
+dnl
+
 AX_AT_CHECK_PYREDIFF([echo ab; echo c], [0], [dnl
 ab?d?
 C
 ], [],
  [echo expected mismatch;at_failed=false],
  [echo unexpected match;at_failed=:])
 
+AT_CHECK([echo ab; echo c], [0], [stdout])
+
+AX_AT_DIFF_PYRE([04.re], [stdout], [0], [],
+ [echo expected mismatch;at_failed=false],
+ [echo unexpected match;at_failed=:])
+
+
 AT_CLEANUP()