diff options
author | Hugo Hörnquist <hugo@lysator.liu.se> | 2022-03-04 01:50:46 +0100 |
---|---|---|
committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2022-03-06 11:37:32 +0100 |
commit | 1cc4d947524b4780f0055e62e152083982bbf186 (patch) | |
tree | 31f4667b8a0eb7a77563df1fe98460a5d6774613 /tests/run-tests.scm | |
parent | Tests now use our local compiled files. (diff) | |
download | calp-1cc4d947524b4780f0055e62e152083982bbf186.tar.gz calp-1cc4d947524b4780f0055e62e152083982bbf186.tar.xz |
Allow explicit GUILE environment, document it.
The environment variable GUILE can now be set to override the guile
version, which allows us to test the code with multiple
versions/implementations.
Also updates README to note these variables.
Diffstat (limited to '')
-rwxr-xr-x | tests/run-tests.scm | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/tests/run-tests.scm b/tests/run-tests.scm index dbe6dede..43f3ccf8 100755 --- a/tests/run-tests.scm +++ b/tests/run-tests.scm @@ -1,13 +1,12 @@ #!/usr/bin/bash here=$(dirname $(realpath $0)) -export GUILE_LOAD_PATH=$(dirname $here)/module -export GUILE_LOAD_COMPILED_PATH=$(dirname $here)/obj -export GUILE_AUTO_COMPILE=0 -make -C $(dirname $here) go_files +. "$(dirname "$here")/env" -exec guile --debug -s "$0" "$@" +make -C $(dirname $here) GUILE="$GUILE" go_files + +exec $GUILE --debug -s "$0" "$@" !# ;;; Commentary: @@ -43,11 +42,6 @@ exec guile --debug -s "$0" "$@" (eval-when (compile load eval) (define here (dirname (current-filename)))) -(add-to-load-path (format #f "~a/module" (dirname here))) -(set! %load-compiled-path (cons (format #f "~a/obj" (dirname here)) - %load-compiled-path)) - - (use-modules (srfi srfi-64)) (define (µs x) @@ -105,6 +99,7 @@ exec guile --debug -s "$0" "$@" ;; after everything else is done (test-runner-on-final! runner (lambda (runner) + (format #t "Guile version ~a~%~%" (version)) (format #t "pass: ~a~%" (test-runner-pass-count runner)) (format #t "fail: ~a~%" (test-runner-fail-count runner)) (format #t "xpass: ~a~%" (test-runner-xpass-count runner)) @@ -218,4 +213,3 @@ exec guile --debug -s "$0" "$@" (lambda (port) (coverage-data->lcov data port))))) (test-end "tests") - |