[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdelibs/frameworks] staging/kde4support/autotests: Fix CI failure, now that the CI uses DESTDIR to
From:       David Faure <faure () kde ! org>
Date:       2013-10-27 10:39:36
Message-ID: E1VaNku-0005k1-5u () scm ! kde ! org
[Download RAW message or body]

Git commit 61eac1fd3e7a885a11fcd7c64ab29d2584906e82 by David Faure.
Committed on 27/10/2013 at 10:38.
Pushed by dfaure into branch 'frameworks'.

Fix CI failure, now that the CI uses DESTDIR to install into a jailroot.

findExe() uses compiled-in prefix (i.e. final destination)
while locate("exe") uses env vars only (i.e. finds the jail root).
Check that both work, but not that they are both equal.

M  +7    -8    staging/kde4support/autotests/kstandarddirstest.cpp

http://commits.kde.org/kdelibs/61eac1fd3e7a885a11fcd7c64ab29d2584906e82

diff --git a/staging/kde4support/autotests/kstandarddirstest.cpp \
b/staging/kde4support/autotests/kstandarddirstest.cpp index d76114e..104c2e9 100644
--- a/staging/kde4support/autotests/kstandarddirstest.cpp
+++ b/staging/kde4support/autotests/kstandarddirstest.cpp
@@ -282,14 +282,6 @@ void KStandarddirsTest::testFindExe()
     QVERIFY2(kdeinit.endsWith("bin/kdeinit5" EXT, PATH_SENSITIVITY), \
qPrintable(kdeinit));  #endif
 
-
-#ifdef Q_OS_UNIX
-    // findExe with a result in libexec
-    const QString kioslave = KGlobal::dirs()->findExe( "kioslave" );
-    QVERIFY( !kioslave.isEmpty() );
-    QVERIFY( kioslave.endsWith( LIB_INSTALL_DIR "/kde5/libexec/kioslave" EXT, \
                PATH_SENSITIVITY ) );
-#endif
-
 #ifndef Q_OS_MAC // kdeinit5 is a bundle on Mac, so the below doesn't work
     // Check the "exe" resource too
     QString kdeinitPath1 = KStandardDirs::realFilePath(kdeinit);
@@ -305,7 +297,14 @@ void KStandarddirsTest::testFindExe()
 #endif
 
 #ifdef Q_OS_UNIX
+    // findExe with a result in libexec
+    const QString kioslave = KGlobal::dirs()->findExe( "kioslave" );
+    QVERIFY( !kioslave.isEmpty() );
+    QVERIFY( kioslave.endsWith( LIB_INSTALL_DIR "/kde5/libexec/kioslave" EXT, \
PATH_SENSITIVITY ) ); +
     QCOMPARE_PATHS(KGlobal::dirs()->realFilePath(kioslave), \
KGlobal::dirs()->locate("exe", "kioslave")); +    const QString findExeKioslave = \
KGlobal::dirs()->locate("exe", "kioslave"); +    \
QVERIFY(kioslave.endsWith(LIB_INSTALL_DIR "/kde5/libexec/kioslave" EXT, \
PATH_SENSITIVITY));  
     // findExe with relative path
     const QString pwd = QDir::currentPath();


[prev in list] [next in list] [prev in thread] [next in thread]