Pedro Monreal Gonzalez
bcc05eb282
- Fix broken GPGME QT tests: Upstram dev task dev.gnupg.org/T6313
* The original patch has been modified to expand the changes
also to the tests/gpgme/Makefile.in file.
* Add gnupg-tests-Fix-tests-gpgme-for-in-source-tree-builds.patch
OBS-URL: https://build.opensuse.org/request/show/1059898
OBS-URL: https://build.opensuse.org/package/show/Base:System/gpg2?expand=0&rev=283
81 lines
2.7 KiB
Diff
81 lines
2.7 KiB
Diff
From e89d57a2cb10bd04d266165015f159be2ab48984 Mon Sep 17 00:00:00 2001
|
|
From: NIIBE Yutaka <gniibe@fsij.org>
|
|
Date: Wed, 21 Dec 2022 10:52:24 +0900
|
|
Subject: tests: Fix tests/gpgme for in-source-tree builds.
|
|
|
|
* tests/gpgme/Makefile.am: Don't use setup.scm/ dir.
|
|
* tests/gpgme/Makefile.in: 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>
|
|
|
|
Index: gnupg-2.4.0/tests/gpgme/Makefile.am
|
|
===================================================================
|
|
--- gnupg-2.4.0.orig/tests/gpgme/Makefile.am
|
|
+++ gnupg-2.4.0/tests/gpgme/Makefile.am
|
|
@@ -47,8 +47,7 @@ check: xcheck
|
|
|
|
.PHONY: xcheck
|
|
xcheck:
|
|
- @$(MKDIR_P) setup.scm/tests \
|
|
- tests/gpg lang/qt/tests lang/python/tests
|
|
+ @$(MKDIR_P) tests/gpg lang/qt/tests lang/python/tests
|
|
$(TESTS_ENVIRONMENT) $(abs_top_builddir)/tests/gpgscm/gpgscm$(EXEEXT) \
|
|
$(abs_srcdir)/run-tests.scm $(TESTFLAGS) $(TESTS)
|
|
|
|
@@ -61,4 +60,4 @@ CLEANFILES = *.log report.xml
|
|
all-local: $(required_pgms)
|
|
|
|
clean-local:
|
|
- -rm -rf setup.scm/tests tests/gpg lang/qt/tests lang/python/tests
|
|
+ -rm -rf tests lang
|
|
Index: gnupg-2.4.0/tests/gpgme/Makefile.in
|
|
===================================================================
|
|
--- gnupg-2.4.0.orig/tests/gpgme/Makefile.in
|
|
+++ gnupg-2.4.0/tests/gpgme/Makefile.in
|
|
@@ -614,8 +614,7 @@ check: xcheck
|
|
|
|
.PHONY: xcheck
|
|
xcheck:
|
|
- @$(MKDIR_P) setup.scm/tests \
|
|
- tests/gpg lang/qt/tests lang/python/tests
|
|
+ @$(MKDIR_P) tests/gpg lang/qt/tests lang/python/tests
|
|
$(TESTS_ENVIRONMENT) $(abs_top_builddir)/tests/gpgscm/gpgscm$(EXEEXT) \
|
|
$(abs_srcdir)/run-tests.scm $(TESTFLAGS) $(TESTS)
|
|
|
|
@@ -624,7 +623,7 @@ xcheck:
|
|
all-local: $(required_pgms)
|
|
|
|
clean-local:
|
|
- -rm -rf setup.scm/tests tests/gpg lang/qt/tests lang/python/tests
|
|
+ -rm -rf tests lang
|
|
|
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
Index: gnupg-2.4.0/tests/gpgme/all-tests.scm
|
|
===================================================================
|
|
--- gnupg-2.4.0.orig/tests/gpgme/all-tests.scm
|
|
+++ gnupg-2.4.0/tests/gpgme/all-tests.scm
|
|
@@ -41,7 +41,7 @@
|
|
(test::scm
|
|
#f
|
|
#f
|
|
- (path-join "tests" "gpgme" "setup.scm" "tests" "gpg")
|
|
+ (path-join "tests" "gpgme" "tests" "gpg")
|
|
(in-srcdir "tests" "gpgme" "setup.scm")
|
|
"--" "tests" "gpg")))
|
|
(define setup-py
|
|
@@ -49,7 +49,7 @@
|
|
(test::scm
|
|
#f
|
|
#f
|
|
- (path-join "tests" "gpgme" "setup.scm" "lang" "python" "tests")
|
|
+ (path-join "tests" "gpgme" "lang" "python" "tests")
|
|
(in-srcdir "tests" "gpgme" "setup.scm")
|
|
"--" "lang" "python" "tests")))
|
|
|