diff options
| author | Andre Heinecke <[email protected]> | 2016-04-11 15:46:03 +0000 |
|---|---|---|
| committer | Andre Heinecke <[email protected]> | 2016-04-11 15:46:03 +0000 |
| commit | d9f7a18ed88127e7f05d770d55118d1e928f3b3f (patch) | |
| tree | f16069e8e559da981ced228015865ec12520f276 | |
| parent | Qt: Remove remaining boost usage (diff) | |
| download | gpgme-d9f7a18ed88127e7f05d770d55118d1e928f3b3f.tar.gz gpgme-d9f7a18ed88127e7f05d770d55118d1e928f3b3f.zip | |
Qt: Fix unit test by adding initial.test dep
* lang/qt/tests/t-keylist.cpp: Verify that GNUPGHOME is set.
* lang/qt/tests/initial.test: New dummy test.
* lang/qt/tests/Makefile.am: Add dependency to initial.test
--
Feels weird but this follows the pattern in tests/gpg/Makefile.am
and solves the problem that the environment is dirty.
| -rw-r--r-- | lang/qt/tests/Makefile.am | 14 | ||||
| -rwxr-xr-x | lang/qt/tests/initial.test | 2 | ||||
| -rw-r--r-- | lang/qt/tests/t-keylist.cpp | 6 |
3 files changed, 18 insertions, 4 deletions
diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am index 3b483fe8..def50c86 100644 --- a/lang/qt/tests/Makefile.am +++ b/lang/qt/tests/Makefile.am @@ -22,7 +22,9 @@ GPG = gpg TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) -TESTS = t-keylist +EXTRA_DIST = initial.test + +TESTS = initial.test t-keylist moc_files = t-keylist.moc @@ -38,7 +40,11 @@ AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@ \ -I$(top_srcdir)/lang/cpp/src -I$(top_srcdir)/lang/qt/src \ -DTOP_SRCDIR="$(top_srcdir)" -check-local: ./t-keylist ./pubring-stamp +check-local: ./pubring-stamp + +# To guarantee that check-local is run before any tests we +# add this dependency: +initial.test : check-local t_keylist_SOURCES = t-keylist.cpp t-keylist.h @@ -58,8 +64,8 @@ export GNUPGHOME := $(abs_builddir) $(top_srcdir)/tests/gpg/secdemo.asc $(GPG) --no-permission-warning \ --import $(top_srcdir)/tests/gpg/pubdemo.asc - -$(GPG) --no-permission-warning \ - --import $(top_srcdir)/tests/gpg/secdemo.asc + $(GPG) --no-permission-warning \ + --import $(top_srcdir)/tests/gpg/secdemo.asc touch ./pubring-stamp .cpp.moc: diff --git a/lang/qt/tests/initial.test b/lang/qt/tests/initial.test new file mode 100755 index 00000000..039e4d00 --- /dev/null +++ b/lang/qt/tests/initial.test @@ -0,0 +1,2 @@ +#!/bin/sh +exit 0 diff --git a/lang/qt/tests/t-keylist.cpp b/lang/qt/tests/t-keylist.cpp index 626d0a7f..8aa59990 100644 --- a/lang/qt/tests/t-keylist.cpp +++ b/lang/qt/tests/t-keylist.cpp @@ -23,6 +23,12 @@ private Q_SLOTS: const QString kId = QLatin1String(keys.front().keyID()); Q_ASSERT (kId == QStringLiteral("2D727CC768697734")); } + + void initTestCase() + { + const QString gpgHome = qgetenv("GNUPGHOME"); + QVERIFY2(!gpgHome.isEmpty(), "GNUPGHOME environment variable is not set."); + } }; QTEST_MAIN(KeyListTest) |