ping! On Fri, Apr 2, 2021, 12:21 AM Aleix Conchillo FlaquƩ wrote: > * module/srfi/srfi-64/testing.scm: fix double test-name evaluation which > also fix unused variable warnings as a bonus. > > Signed-off-by: Aleix Conchillo FlaquƩ > --- > module/srfi/srfi-64/testing.scm | 36 ++++++++++++++++----------------- > 1 file changed, 18 insertions(+), 18 deletions(-) > > diff --git a/module/srfi/srfi-64/testing.scm > b/module/srfi/srfi-64/testing.scm > index 37792cd0f..4237a5614 100644 > --- a/module/srfi/srfi-64/testing.scm > +++ b/module/srfi/srfi-64/testing.scm > @@ -707,9 +707,9 @@ > (syntax-case (list x (list (syntax quote) (%test-source-line2 x))) > () > (((mac tname expr) line) > (syntax > - (let* ((r (test-runner-get)) > - (name tname)) > - (test-result-alist! r (cons (cons 'test-name tname) line)) > + (let* ((name tname) > + (r (test-runner-get))) > + (test-result-alist! r (cons (cons 'test-name name) line)) > (%test-comp1body r expr)))) > (((mac expr) line) > (syntax > @@ -720,9 +720,9 @@ > (syntax-case (list x (list (syntax quote) (%test-source-line2 x)) > comp) () > (((mac tname expected expr) line comp) > (syntax > - (let* ((r (test-runner-get)) > - (name tname)) > - (test-result-alist! r (cons (cons 'test-name tname) line)) > + (let* ((name tname) > + (r (test-runner-get))) > + (test-result-alist! r (cons (cons 'test-name name) line)) > (%test-comp2body r comp expected expr)))) > (((mac expected expr) line comp) > (syntax > @@ -740,9 +740,9 @@ > (syntax-case (list x (list (syntax quote) (%test-source-line2 x))) > () > (((mac tname expected expr error) line) > (syntax > - (let* ((r (test-runner-get)) > - (name tname)) > - (test-result-alist! r (cons (cons 'test-name tname) line)) > + (let* ((name tname) > + (r (test-runner-get))) > + (test-result-alist! r (cons (cons 'test-name name) line)) > (%test-comp2body r (%test-approximate= error) expected expr)))) > (((mac expected expr error) line) > (syntax > @@ -759,9 +759,9 @@ > (define-syntax test-assert > (syntax-rules () > ((test-assert tname test-expression) > - (let* ((r (test-runner-get)) > - (name tname)) > - (test-result-alist! r '((test-name . tname))) > + (let* ((name tname) > + (r (test-runner-get))) > + (test-result-alist! r '((test-name . name))) > (%test-comp1body r test-expression))) > ((test-assert test-expression) > (let* ((r (test-runner-get))) > @@ -770,9 +770,9 @@ > (define-syntax %test-comp2 > (syntax-rules () > ((%test-comp2 comp tname expected expr) > - (let* ((r (test-runner-get)) > - (name tname)) > - (test-result-alist! r (list (cons 'test-name tname))) > + (let* ((name tname) > + (r (test-runner-get))) > + (test-result-alist! r (list (cons 'test-name name))) > (%test-comp2body r comp expected expr))) > ((%test-comp2 comp expected expr) > (let* ((r (test-runner-get))) > @@ -895,9 +895,9 @@ > (syntax-case (list x (list (syntax quote) (%test-source-line2 x))) > () > (((mac tname etype expr) line) > (syntax > - (let* ((r (test-runner-get)) > - (name tname)) > - (test-result-alist! r (cons (cons 'test-name tname) line)) > + (let* ((name tname) > + (r (test-runner-get))) > + (test-result-alist! r (cons (cons 'test-name name) line)) > (%test-error r etype expr)))) > (((mac etype expr) line) > (syntax > -- > 2.31.1 > >