diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2022-12-01 05:59:06 +0100 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2022-12-01 05:59:06 +0100 |
| commit | f182c284fb2c093f8dbfc6a4b815762f36cc5217 (patch) | |
| tree | 7df9f36103f2f9be83f135b714904ffbd9c432a7 | |
| parent | tests: Fix tests under cms. (diff) | |
| download | gnupg2-f182c284fb2c093f8dbfc6a4b815762f36cc5217.tar.xz gnupg2-f182c284fb2c093f8dbfc6a4b815762f36cc5217.zip | |
tests: Support semihosted environment.
* Makefile.am (check-all): Add EXEEXT.
* agent/all-tests.scm: Append EXEEXT.
* common/all-tests.scm: Likewise.
* g10/all-tests.scm: Likewise.
* g13/all-tests.scm: Likewise.
--
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | agent/all-tests.scm | 7 | ||||
| -rw-r--r-- | common/all-tests.scm | 7 | ||||
| -rw-r--r-- | g10/all-tests.scm | 7 | ||||
| -rw-r--r-- | g13/all-tests.scm | 7 |
5 files changed, 17 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am index 57c60cab4..6751f4613 100644 --- a/Makefile.am +++ b/Makefile.am @@ -218,7 +218,7 @@ TESTS_ENVIRONMENT = \ .PHONY: check-all release sign-release check-all: $(TESTS_ENVIRONMENT) \ - $(abs_top_builddir)/tests/gpgscm/gpgscm \ + $(abs_top_builddir)/tests/gpgscm/gpgscm$(EXEEXT) \ $(abs_srcdir)/tests/run-tests.scm $(TESTFLAGS) $(TESTS) # Names of to help the release target. diff --git a/agent/all-tests.scm b/agent/all-tests.scm index 9376adf6e..0d4ddd720 100644 --- a/agent/all-tests.scm +++ b/agent/all-tests.scm @@ -27,9 +27,10 @@ (parse-makefile-expand filename expander key)) (map (lambda (name) - (test::binary #f - (path-join "agent" name) - (path-join (getenv "objdir") "agent" name))) + (let ((name-ext (string-append name (getenv "EXEEXT")))) + (test::binary #f + (path-join "agent" name-ext) + (path-join (getenv "objdir") "agent" name-ext)))) (parse-makefile-expand (in-srcdir "agent" "Makefile.am") (lambda (filename port key) (parse-makefile port key)) "module_tests"))) diff --git a/common/all-tests.scm b/common/all-tests.scm index 54f1153a5..6cbbcbe67 100644 --- a/common/all-tests.scm +++ b/common/all-tests.scm @@ -19,9 +19,10 @@ ;; XXX: Currently, the makefile parser does not understand this ;; Makefile.am, so we hardcode the list of tests here. (map (lambda (name) - (test::binary #f - (path-join "common" name) - (path-join (getenv "objdir") "common" name))) + (let ((name-ext (string-append name (getenv "EXEEXT")))) + (test::binary #f + (path-join "common" name-ext) + (path-join (getenv "objdir") "common" name-ext)))) (list "t-stringhelp" "t-timestuff" "t-convert" diff --git a/g10/all-tests.scm b/g10/all-tests.scm index 982220b28..02fcde7b5 100644 --- a/g10/all-tests.scm +++ b/g10/all-tests.scm @@ -27,9 +27,10 @@ (parse-makefile-expand filename expander key)) (map (lambda (name) - (test::binary #f - (path-join "g10" name) - (path-join (getenv "objdir") "g10" name))) + (let ((name-ext (string-append name (getenv "EXEEXT")))) + (test::binary #f + (path-join "g10" name-ext) + (path-join (getenv "objdir") "g10" name-ext)))) (parse-makefile-expand (in-srcdir "g10" "Makefile.am") (lambda (filename port key) (parse-makefile port key)) "module_tests"))) diff --git a/g13/all-tests.scm b/g13/all-tests.scm index c96f09231..813372358 100644 --- a/g13/all-tests.scm +++ b/g13/all-tests.scm @@ -34,9 +34,10 @@ "g13")))) (if g13-enabled? (map (lambda (name) - (test::binary #f - (path-join "g13" name) - (path-join (getenv "objdir") "g13" name))) + (let ((name-ext (string-append name (getenv "EXEEXT")))) + (test::binary #f + (path-join "g13" name-ext) + (path-join (getenv "objdir") "g13" name-ext)))) (parse-makefile-expand (in-srcdir "g13" "Makefile.am") (lambda (filename port key) (parse-makefile port key)) "module_tests")) |