1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
|
From d3087348348b4a7fcfb05bf2a75b4a63453e1c77 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Thu, 1 Feb 2018 10:14:30 +0800
Subject: [PATCH 7/7] qt/python: Add variables to tests
* configure.ac, lang/python/Makefile.am:
New variable to `lang/python', set to `lang/python' if RUN_LANG_PYTHON_TESTS
* configure.ac, lang/qt/Makefile.am:
New variable to `lang/qt', set to `lang/qt' if RUN_LANG_QT_TESTS
Upstream-Status: Submitted [gnupg-devel@gnupg.org]
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
configure.ac | 11 +++++++++++
lang/python/Makefile.am | 3 +++
lang/qt/Makefile.am | 8 +++++++-
3 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 7485cdf..4aa216d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -535,6 +535,17 @@ AC_ARG_ENABLE(g13-test,
run_g13_test=$enableval)
AM_CONDITIONAL(RUN_G13_TESTS, test "$run_g13_test" = "yes")
+run_lang_python_test="yes"
+AC_ARG_ENABLE(lang-python-test,
+ AC_HELP_STRING([--disable-lang-python-test], [disable Python regression test]),
+ run_lang_python_test=$enableval)
+AM_CONDITIONAL(RUN_LANG_PYTHON_TESTS, test "$run_lang_python_test" = "yes")
+
+run_lang_qt_test="yes"
+AC_ARG_ENABLE(lang-qt-test,
+ AC_HELP_STRING([--disable-lang-qt-test], [disable Qt regression test]),
+ run_lang_qt_test=$enableval)
+AM_CONDITIONAL(RUN_LANG_QT_TESTS, test "$run_lang_qt_test" = "yes")
# Checks for header files.
AC_CHECK_HEADERS_ONCE([locale.h sys/select.h sys/uio.h argp.h
diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
index 5a468f1..43b9788 100644
--- a/lang/python/Makefile.am
+++ b/lang/python/Makefile.am
@@ -24,7 +24,10 @@ EXTRA_DIST = \
examples \
src
+if RUN_LANG_PYTHON_TESTS
SUBDIRS = . tests
+endif
+
.PHONY: prepare
prepare: copystamp
diff --git a/lang/qt/Makefile.am b/lang/qt/Makefile.am
index ab85960..a244ede 100644
--- a/lang/qt/Makefile.am
+++ b/lang/qt/Makefile.am
@@ -19,6 +19,12 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA
-SUBDIRS = src tests doc
+if RUN_LANG_QT_TESTS
+qttests = tests
+else
+qttests =
+endif
+
+SUBDIRS = src ${qttests} doc
EXTRA_DIST = README
--
2.7.4
|
