Don't escape forward slashes to prevent a warning from grep 3.8. diff --git a/tests/link-order.at b/tests/link-order.at --- a/tests/link-order.at +++ b/tests/link-order.at @@ -99,12 +99,12 @@ aix* | interix*) ;; # These systems have different path syntax case $hardcode_direct$hardcode_direct_absolute in yesno) AT_CHECK([if $EGREP relinking stderr; then - $EGREP " .*\/new\/lib/libb$shared_ext .*\/old\/lib/libcee$shared_ext" stdout + $EGREP " .*/new/lib/libb$shared_ext .*/old/lib/libcee$shared_ext" stdout else :; fi], [0], [ignore], [], [echo "wrong link order"]) ;; *) AT_CHECK([if $EGREP relinking stderr; then - $EGREP " -L.*\/new\/lib -lb -L.*\/old\/lib -lcee" stdout + $EGREP " -L.*/new/lib -lb -L.*/old/lib -lcee" stdout else :; fi], [0], [ignore], [], [echo "wrong link order"]) ;; esac diff --git a/tests/testsuite b/tests/testsuite --- a/tests/testsuite +++ b/tests/testsuite @@ -20611,11 +20611,11 @@ aix* | interix*) ;; # These systems have different path syntax yesno) { set +x $as_echo "$at_srcdir/link-order.at:101: if \$EGREP relinking stderr; then - \$EGREP \" .*\\/new\\/lib/libb\$shared_ext .*\\/old\\/lib/libcee\$shared_ext\" stdout + \$EGREP \" .*/new/lib/libb\$shared_ext .*/old/lib/libcee\$shared_ext\" stdout else :; fi" at_fn_check_prepare_notrace 'an embedded newline' "link-order.at:101" ( $at_check_trace; if $EGREP relinking stderr; then - $EGREP " .*\/new\/lib/libb$shared_ext .*\/old\/lib/libcee$shared_ext" stdout + $EGREP " .*/new/lib/libb$shared_ext .*/old/lib/libcee$shared_ext" stdout else :; fi ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false @@ -20633,11 +20633,11 @@ $at_traceon; } *) { set +x $as_echo "$at_srcdir/link-order.at:106: if \$EGREP relinking stderr; then - \$EGREP \" -L.*\\/new\\/lib -lb -L.*\\/old\\/lib -lcee\" stdout + \$EGREP \" -L.*/new\\/lib -lb -L.*/old/lib -lcee\" stdout else :; fi" at_fn_check_prepare_notrace 'an embedded newline' "link-order.at:106" ( $at_check_trace; if $EGREP relinking stderr; then - $EGREP " -L.*\/new\/lib -lb -L.*\/old\/lib -lcee" stdout + $EGREP " -L.*/new/lib -lb -L.*/old/lib -lcee" stdout else :; fi ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false e (Expand)Author 2020-01-16records: Improve reporting of "invalid field specifier" errors....Previously users would just see: error: invalid field specifier without source location or hints. * guix/records.scm (expand): Add optional 'parent-form' parameter and pass it to 'syntax-violation' when it is true. (make-syntactic-constructor): Pass S as a third argument to 'report-invalid-field-specifier'. * guix/ui.scm (report-load-error): For 'syntax-error', show SUBFORM or FORM in the message. * tests/records.scm ("define-record-type* & wrong field specifier"): Add a 'subform' parameter and adjust test accordingly. ("define-record-type* & wrong field specifier, identifier"): New test. * tests/guix-system.sh: Add test. Ludovic Courtès 2019-03-30records: Support custom 'this' identifiers....This lets record users choose an identifier other than 'this-record'. * guix/records.scm (make-syntactic-constructor): Add #:this-identifier. [wrap-field-value]: Honor it. (define-record-type*): Add form with extra THIS-IDENTIFIER and honor it. * tests/records.scm ("define-record-type* & thunked & inherit & custom this"): New test. Ludovic Courtès 2019-03-25records: Allow thunked fields to refer to 'this-record'....* guix/records.scm (this-record): New syntax parameter. (make-syntactic-constructor)[wrap-field-value]: When F is thunked, return a one-argument lambda instead of a thunk, and parameterize THIS-RECORD. (define-record-type*)[thunked-field-accessor-definition]: Pass X to (real-get X). * tests/records.scm ("define-record-type* & thunked & this-record") ("define-record-type* & thunked & default & this-record") ("define-record-type* & thunked & inherit & this-record"): New tests. Ludovic Courtès 2019-01-22records: Detect duplicate field initializers....* guix/records.scm (report-duplicate-field-specifier): New procedure. (make-syntactic-constructor): Call it. * tests/records.scm ("define-record-type* & duplicate initializers"): New test. Co-authored-by: Mark H Weaver <mhw@netris.org> Ludovic Courtès 2018-08-31records: Adjust to test changes in 'record-abi-mismatch-error'....Fixes a test failure introduced in de5cbd4a38a33e0412f1c481fe8e01a871dc13e5. * guix/records.scm (abi-check): Refer to TYPE in an unquoted context so we get at the RTD. * tests/records.scm ("ABI checks"): Adjust 'catch' handler to changes in the 'record-abi-mismatch-error' arguments. Ludovic Courtès 2018-05-23records: Insert record type ABI checks in constructors....* guix/records.scm (print-record-abi-mismatch-error): New procedure. <top level>: Add 'set-exception-printer!' call. (current-abi-identifier, abi-check): New procedures. (make-syntactic-constructor): Add #:abi-cookie parameter. Insert calls to 'abi-check'. (define-record-type*)[compute-abi-cookie]: New procedure. Use it and emit a definition of the 'current-abi-identifier' for TYPE. * tests/records.scm ("ABI checks"): New test. Ludovic Courtès