summaryrefslogtreecommitdiffstats
path: root/certmanager/lib
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-03-07 22:21:34 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-03-07 22:21:34 -0600
commitadafb126df16b9357494a47fcec20171ad6c8644 (patch)
treed842e4f2b20a477cc0f622cddca9fee4a98db82f /certmanager/lib
parent29d4a9cebb53f0220f7cf63f95ca8cbfd0f28793 (diff)
parentedc8fc84751a8eb968a9b8c4c75530c8ccb7523d (diff)
downloadtdepim-adafb126df16b9357494a47fcec20171ad6c8644.tar.gz
tdepim-adafb126df16b9357494a47fcec20171ad6c8644.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdepim
Diffstat (limited to 'certmanager/lib')
-rw-r--r--certmanager/lib/tests/Makefile.am2
-rw-r--r--certmanager/lib/tests/test_verify.cpp8
2 files changed, 5 insertions, 5 deletions
diff --git a/certmanager/lib/tests/Makefile.am b/certmanager/lib/tests/Makefile.am
index 331d4d8e9..3e8b7c367 100644
--- a/certmanager/lib/tests/Makefile.am
+++ b/certmanager/lib/tests/Makefile.am
@@ -1,6 +1,6 @@
AM_CPPFLAGS = -I$(top_srcdir)/certmanager/lib \
-I$(top_srcdir)/libtdenetwork \
- $(GPGME_CFLAGS) $(all_includes) -DKDESRCDIR=\"$(srcdir)\"
+ $(GPGME_CFLAGS) $(all_includes) -DTDESRCDIR=\"$(srcdir)\"
check_PROGRAMS = test_keylister test_keygen test_keyselectiondialog \
test_cryptoconfig test_gnupgprocessbase test_jobs test_verify
diff --git a/certmanager/lib/tests/test_verify.cpp b/certmanager/lib/tests/test_verify.cpp
index 331d3759e..72ce9b2f8 100644
--- a/certmanager/lib/tests/test_verify.cpp
+++ b/certmanager/lib/tests/test_verify.cpp
@@ -49,7 +49,7 @@
int main( int argc, char **argv )
{
- setenv("GNUPGHOME", KDESRCDIR "/gnupg_home", 1 );
+ setenv("GNUPGHOME", TDESRCDIR "/gnupg_home", 1 );
setenv("LC_ALL", "C", 1);
setenv("TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kde-unit-test" ), 1);
@@ -57,8 +57,8 @@ int main( int argc, char **argv )
KCmdLineArgs::init( argc, argv, &aboutData );
KApplication app( false, false );
- const TQString sigFileName = KDESRCDIR "/test.data.sig";
- const TQString dataFileName = KDESRCDIR "/test.data";
+ const TQString sigFileName = TDESRCDIR "/test.data.sig";
+ const TQString dataFileName = TDESRCDIR "/test.data";
TQFile sigFile( sigFileName );
assert( sigFile.open( IO_ReadOnly ) );
@@ -77,7 +77,7 @@ int main( int argc, char **argv )
assert( sig.creationTime() == 1189650248L );
assert( sig.validity() == GpgME::Signature::Full );
- const TQString opaqueFileName = KDESRCDIR "/test.data.gpg";
+ const TQString opaqueFileName = TDESRCDIR "/test.data.gpg";
TQFile opaqueFile( opaqueFileName );
assert( opaqueFile.open( IO_ReadOnly ) );
TQByteArray clearText;