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

List:       kde-commits
Subject:    [kdelibs/KDE/4.8] kdecore/tests: Disable part of this test on OSX.
From:       Till Adam <till () kdab ! com>
Date:       2012-01-10 19:14:22
Message-ID: 20120110191422.6211BA60A6 () git ! kde ! org
[Download RAW message or body]

Git commit dd4ddcb8f04a26db4121397ade304706ee2a03d8 by Till Adam.
Committed on 10/01/2012 at 20:10.
Pushed by tilladam into branch 'KDE/4.8'.

Disable part of this test on OSX. OK'd by dfaure.

M  +2    -0    kdecore/tests/kstandarddirstest.cpp

http://commits.kde.org/kdelibs/dd4ddcb8f04a26db4121397ade304706ee2a03d8

diff --git a/kdecore/tests/kstandarddirstest.cpp b/kdecore/tests/kstandarddirstest.cpp
index ca19d26..2b3fb40 100644
--- a/kdecore/tests/kstandarddirstest.cpp
+++ b/kdecore/tests/kstandarddirstest.cpp
@@ -234,10 +234,12 @@ void KStandarddirsTest::testFindExe()
     QVERIFY( lnusertemp.endsWith( "lib" KDELIBSUFF "/kde4/libexec/lnusertemp" EXT, PATH_SENSITIVITY ) );
 #endif
 
+#ifndef Q_OS_MAC // kdeinit4 is a bundle on Mac, so the below doesn't work
     // Check the "exe" resource too
     QString kdeinitPath1 = KGlobal::dirs()->realFilePath(kdeinit);
     QString kdeinitPath2 = KGlobal::dirs()->locate( "exe", "kdeinit4" );
     QCOMPARE_PATHS( kdeinitPath1, kdeinitPath2 );
+#endif
 
 #ifdef Q_OS_UNIX
     QCOMPARE_PATHS( KGlobal::dirs()->realFilePath(lnusertemp),
[prev in list] [next in list] [prev in thread] [next in thread]