From 644ef0aa848c2cef6621e0ae6be8b14322b015d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Mon, 11 Sep 2023 00:30:49 +0200 Subject: Change how entry point is handled. Replaces the old main sh bootstrap entry point to one written in C. The reasons are in the C file, but in short, Guile's command line is less than ideal. --- tests/run-tests.scm | 9 ++++++--- tests/validate-html/run-validator.scm | 8 ++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) (limited to 'tests') diff --git a/tests/run-tests.scm b/tests/run-tests.scm index ca8f9de4..4bb34ce8 100755 --- a/tests/run-tests.scm +++ b/tests/run-tests.scm @@ -1,9 +1,8 @@ #!/usr/bin/env bash # -*- mode: scheme; geiser-scheme-implementation: guile -*- -here=$(dirname $(realpath $0)) - -. "$(dirname "$here")/env" +root=$(dirname "$(dirname "$(realpath "$0")")") +eval "$(env __PRINT_ENVIRONMENT=1 ${root}/calp)" if [ "$DEBUG" = '' ]; then exec $GUILE -s "$0" "$@" @@ -12,6 +11,10 @@ else fi !# +(unless (getenv "CALP_TEST_ENVIRONMENT") + (format (current-error-port) "Not running in test environment, abandoning~%") + (exit 1)) + (format #t "current-filename = ~s~%" (current-filename)) (define here (dirname (current-filename))) diff --git a/tests/validate-html/run-validator.scm b/tests/validate-html/run-validator.scm index 0c4ee0bc..b363e3ea 100755 --- a/tests/validate-html/run-validator.scm +++ b/tests/validate-html/run-validator.scm @@ -1,12 +1,16 @@ #!/usr/bin/bash # -*- mode: scheme; geiser-scheme-implementation: guile -*- -here=$(dirname $(realpath $0)) +root=$(dirname "$(dirname "$(dirname "$(realpath "$0")")")") -. "$(dirname "$(dirname "$here")")/env" +eval "$(env __PRINT_ENVIRONMENT=1 ${root}/calp)" exec $GUILE -e main -s "$0" -- "$@" !# +(unless (getenv "CALP_TEST_ENVIRONMENT") + (format (current-error-port) "Not running in test environment, abandoning~%") + (exit 1)) + (use-modules (sxml simple) ((sxml xpath) :select (sxpath)) (sxml match) -- cgit v1.2.3