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

List:       kde-commits
Subject:    [kdelibs/frameworks] staging/kde4support/autotests: Use cmake as a reliable installed binary, rather
From:       David Faure <faure+bluesystems () kde ! org>
Date:       2013-01-31 21:49:10
Message-ID: 20130131214910.41F1EA60C8 () git ! kde ! org
[Download RAW message or body]

Git commit ae14ee3de28ec3d0fb147c5483a5aa5c69fc9ebf by David Faure.
Committed on 31/01/2013 at 19:27.
Pushed by dfaure into branch 'frameworks'.

Use cmake as a reliable installed binary, rather than u-m-d.

update-mime-database is apparently a shell script on ubuntu these days.

M  +2    -2    staging/kde4support/autotests/kmimetypetest.cpp

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

diff --git a/staging/kde4support/autotests/kmimetypetest.cpp \
b/staging/kde4support/autotests/kmimetypetest.cpp index 31ecd2e..89c92d8 100644
--- a/staging/kde4support/autotests/kmimetypetest.cpp
+++ b/staging/kde4support/autotests/kmimetypetest.cpp
@@ -262,8 +262,8 @@ void KMimeTypeTest::testFindByPathUsingFileName_data()
         QTest::newRow("png image") << fh << "image/png";
     }
 
-    const QString exePath = QStandardPaths::findExecutable("update-mime-database");
-    QVERIFY2(!exePath.isEmpty(), "update-mime-database not found. Isn't \
shared-mime-info installed, and in your $PATH?"); +    const QString exePath = \
QStandardPaths::findExecutable("cmake"); +    QVERIFY2(!exePath.isEmpty(), "cmake not \
found. Isn't it in your $PATH?");  #ifdef Q_OS_WIN
     const QString executableType = \
QString::fromLatin1("application/x-ms-dos-executable");  #else


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