1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00

tests: Fix tests/gpgme for in-source-tree builds.

* tests/gpgme/Makefile.am: Don't use setup.scm/ dir.
* tests/gpgme/all-tests.scm: Fix the name of the environment.

--

GnuPG-bug-id: 6313
Fixes-commit: c19ea75f10d6278569619f90977ce7c820e9319d
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2022-12-21 10:52:24 +09:00
parent 9610faad90
commit e89d57a2cb
No known key found for this signature in database
GPG Key ID: 640114AF89DE6054
2 changed files with 4 additions and 5 deletions

View File

@ -47,8 +47,7 @@ check: xcheck
.PHONY: xcheck .PHONY: xcheck
xcheck: xcheck:
@$(MKDIR_P) setup.scm/tests \ @$(MKDIR_P) tests/gpg lang/qt/tests lang/python/tests
tests/gpg lang/qt/tests lang/python/tests
$(TESTS_ENVIRONMENT) $(abs_top_builddir)/tests/gpgscm/gpgscm$(EXEEXT) \ $(TESTS_ENVIRONMENT) $(abs_top_builddir)/tests/gpgscm/gpgscm$(EXEEXT) \
$(abs_srcdir)/run-tests.scm $(TESTFLAGS) $(TESTS) $(abs_srcdir)/run-tests.scm $(TESTFLAGS) $(TESTS)
@ -61,4 +60,4 @@ CLEANFILES = *.log report.xml
all-local: $(required_pgms) all-local: $(required_pgms)
clean-local: clean-local:
-rm -rf setup.scm/tests tests/gpg lang/qt/tests lang/python/tests -rm -rf tests lang

View File

@ -41,7 +41,7 @@
(test::scm (test::scm
#f #f
#f #f
(path-join "tests" "gpgme" "setup.scm" "tests" "gpg") (path-join "tests" "gpgme" "tests" "gpg")
(in-srcdir "tests" "gpgme" "setup.scm") (in-srcdir "tests" "gpgme" "setup.scm")
"--" "tests" "gpg"))) "--" "tests" "gpg")))
(define setup-py (define setup-py
@ -49,7 +49,7 @@
(test::scm (test::scm
#f #f
#f #f
(path-join "tests" "gpgme" "setup.scm" "lang" "python" "tests") (path-join "tests" "gpgme" "lang" "python" "tests")
(in-srcdir "tests" "gpgme" "setup.scm") (in-srcdir "tests" "gpgme" "setup.scm")
"--" "lang" "python" "tests"))) "--" "lang" "python" "tests")))