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