diff options
| -rw-r--r-- | certmanager/lib/tests/Makefile.am | 2 | ||||
| -rw-r--r-- | certmanager/lib/tests/test_verify.cpp | 8 | ||||
| -rw-r--r-- | karm/test/locking.cpp | 2 | ||||
| -rw-r--r-- | kmail/tests/Makefile.am | 2 | ||||
| -rw-r--r-- | kmail/tests/mimelibtests.cpp | 4 | ||||
| -rw-r--r-- | ktnef/tests/Makefile.am | 2 | ||||
| -rw-r--r-- | ktnef/tests/parsertest.cpp | 6 | ||||
| -rw-r--r-- | libkcal/tests/testresource.cpp | 2 | ||||
| -rw-r--r-- | libtdepim/tests/testdistrlist.cpp | 2 |
9 files changed, 15 insertions, 15 deletions
diff --git a/certmanager/lib/tests/Makefile.am b/certmanager/lib/tests/Makefile.am index 331d4d8e..3e8b7c36 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 331d3759..72ce9b2f 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; diff --git a/karm/test/locking.cpp b/karm/test/locking.cpp index 71113f79..6bf9f03e 100644 --- a/karm/test/locking.cpp +++ b/karm/test/locking.cpp @@ -133,7 +133,7 @@ int main( int argc, char *argv[] ) setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kde-testresource" ), true ); // Copied from Till's test in libkcal. Not sure what this is for. - setenv( "KDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup + setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup // Copied from Till's test in libkcal. Not sure what this is for. KApplication::disableAutoDcopRegistration(); diff --git a/kmail/tests/Makefile.am b/kmail/tests/Makefile.am index f8bc6ce4..2d492283 100644 --- a/kmail/tests/Makefile.am +++ b/kmail/tests/Makefile.am @@ -1,5 +1,5 @@ INCLUDES = -I$(top_srcdir)/kmail -I$(top_srcdir)/mimelib $(all_includes) -AM_CPPFLAGS = -DKDESRCDIR=\"$(srcdir)\" +AM_CPPFLAGS = -DTDESRCDIR=\"$(srcdir)\" METASOURCES = AUTO check_LTLIBRARIES = kunittest_storagelayermodule.la \ diff --git a/kmail/tests/mimelibtests.cpp b/kmail/tests/mimelibtests.cpp index b152fdcf..6f4cf189 100644 --- a/kmail/tests/mimelibtests.cpp +++ b/kmail/tests/mimelibtests.cpp @@ -73,10 +73,10 @@ void MimeLibTester::setUp() { // This multipart-mixed mail has a part that starts without headers; // the newline after the (empty) headers must be preserved. - mMultipartMixedMail = readFile( KDESRCDIR "/multipartmixed.mbox" ); + mMultipartMixedMail = readFile( TDESRCDIR "/multipartmixed.mbox" ); // This is the full signed mail which was simplified to above. // Kept around in case we want to do anything else with a signed mail later :) - mSignedMail = readFile( KDESRCDIR "/signedmail.mbox" ); + mSignedMail = readFile( TDESRCDIR "/signedmail.mbox" ); } void MimeLibTester::tearDown() diff --git a/ktnef/tests/Makefile.am b/ktnef/tests/Makefile.am index 67849778..15ef5076 100644 --- a/ktnef/tests/Makefile.am +++ b/ktnef/tests/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(top_srcdir)/ktnef $(all_includes) -DKDESRCDIR=\"$(srcdir)\" +AM_CPPFLAGS = -I$(top_srcdir)/ktnef $(all_includes) -DTDESRCDIR=\"$(srcdir)\" LDADD = ../lib/libktnef.la $(LIB_TDECORE) check_PROGRAMS = parsertest diff --git a/ktnef/tests/parsertest.cpp b/ktnef/tests/parsertest.cpp index 9cbce6d5..6e3d3af3 100644 --- a/ktnef/tests/parsertest.cpp +++ b/ktnef/tests/parsertest.cpp @@ -28,7 +28,7 @@ void ParserTest::testSingleAttachment() { KTNEFParser parser; - assert( parser.openFile( KDESRCDIR "/one-file.tnef" ) == true ); + assert( parser.openFile( TDESRCDIR "/one-file.tnef" ) == true ); KTNEFMessage *msg = parser.message(); assert( msg != 0 ); @@ -45,7 +45,7 @@ void ParserTest::testSingleAttachment() void ParserTest::testTwoAttachments() { KTNEFParser parser; - assert( parser.openFile( KDESRCDIR "/two-files.tnef" ) == true ); + assert( parser.openFile( TDESRCDIR "/two-files.tnef" ) == true ); KTNEFMessage *msg = parser.message(); assert( msg != 0 ); @@ -67,7 +67,7 @@ void ParserTest::testTwoAttachments() void ParserTest::testMAPIAttachments() { KTNEFParser parser; - assert( parser.openFile( KDESRCDIR "/mapi_attach_data_obj.tnef" ) == true ); + assert( parser.openFile( TDESRCDIR "/mapi_attach_data_obj.tnef" ) == true ); KTNEFMessage *msg = parser.message(); assert( msg != 0 ); diff --git a/libkcal/tests/testresource.cpp b/libkcal/tests/testresource.cpp index 5779c47b..63dd27fc 100644 --- a/libkcal/tests/testresource.cpp +++ b/libkcal/tests/testresource.cpp @@ -57,7 +57,7 @@ int main(int argc, char *argv[]) // Use another directory than the real one, just to keep things clean // TDEHOME needs to be writable though, for a ksycoca database setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kde-testresource" ), true ); - setenv( "KDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup + setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup KApplication::disableAutoDcopRegistration(); KCmdLineArgs::init(argc,argv,"testresource", 0, 0, 0, 0); diff --git a/libtdepim/tests/testdistrlist.cpp b/libtdepim/tests/testdistrlist.cpp index c171c6ce..3ee85283 100644 --- a/libtdepim/tests/testdistrlist.cpp +++ b/libtdepim/tests/testdistrlist.cpp @@ -44,7 +44,7 @@ int main(int argc, char *argv[]) // Use another directory than the real one, just to keep things clean // TDEHOME needs to be writable though, for a ksycoca database setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kde-testdistrlist" ), true ); - setenv( "KDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup + setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup KApplication::disableAutoDcopRegistration(); KCmdLineArgs::init(argc,argv,"testdistrlist", 0, 0, 0, 0); |