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.
This commit is contained in:
parent
afd8fad6e2
commit
d9f7a18ed8
@ -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,7 +64,7 @@ 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 \
|
||||
$(GPG) --no-permission-warning \
|
||||
--import $(top_srcdir)/tests/gpg/secdemo.asc
|
||||
touch ./pubring-stamp
|
||||
|
||||
|
2
lang/qt/tests/initial.test
Executable file
2
lang/qt/tests/initial.test
Executable file
@ -0,0 +1,2 @@
|
||||
#!/bin/sh
|
||||
exit 0
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user