diff --git a/CHANGES b/CHANGES index a3e885c49c..389d140153 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,9 @@ +7.1.0-dev.516 | 2024-11-12 12:26:41 -0700 + + * diff-remove-abspath: Add separate handling of Windows paths (Tim Wojtulewicz) + + * diff-remove-abspath: Remove capture of windows drive letters from POSIX regex (Tim Wojtulewicz) + 7.1.0-dev.513 | 2024-11-12 16:16:11 +0100 * Bump Spicy to current `main`. (Robin Sommer, Corelight) diff --git a/VERSION b/VERSION index f47ff04631..574bedd000 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.1.0-dev.513 +7.1.0-dev.516 diff --git a/testing/scripts/diff-remove-abspath b/testing/scripts/diff-remove-abspath index 7c30936262..eaf90bb415 100755 --- a/testing/scripts/diff-remove-abspath +++ b/testing/scripts/diff-remove-abspath @@ -2,6 +2,9 @@ # # Replace absolute paths with the basename. +# The drive letter portion of the Windows regex below is adapted from +# https://github.com/stdlib-js/stdlib/blob/develop/lib/node_modules/%40stdlib/regexp/basename-windows/lib/regexp.js sed -E 's#/+#/#g' | sed -E 's#[^( ]*testing_btest#<___>testing_btest#' | - sed -E 's#([a-zA-Z]:)?/([^ :/]{1,}/){1,}([^ :/]{1,})#<...>/\3#g' + sed -E 's#/([^ :/]{1,}/){1,}([^ :/]{1,})#<...>/\2#g' | + sed -E 's#([a-zA-Z]:|[\\/]{2}[^\\/]+[\\/]+[^\\/]+)([\\/])([^ :\\/]{1,}[\\/]){1,}([^ :\\/]{1,})#<...>/\4#g'