← Back to branch summary

~renatofilho/vivid/qtpim-opensource-src

« back to all changes in this revision

Viewing changes to tests/auto/jsondbprocess.h

  • Committer: Package Import Robot
  • Author(s): Timo Jyrinki
  • Date: 2014-05-15 09:27:46 UTC
  • mfrom: (1.1.5)
  • Revision ID: package-import@ubuntu.com-20140515092746-xfip01s9udpv1q06
Tags: 5.0~git20140515~29475884-0ubuntu1
* New upstream snapshot with several upstreamed fixes from renato
  - Remove also the following merged patches:
    Set-the-contact-detail-parent-to-avoid-memory-leak.patch
    Delete-declarative-contact-after-remove-it-from-the-.patch
  - A handful more of now failing upstream tests disabled

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/auto/jsondbprocess.h
68
68
 
69
69
    bool start(const QString &partitionsFilePath = QString(), bool killAllJsonDb = true) {
70
70
 
71
 
        if (killAllJsonDb)
72
 
            system("killall jsondb");
 
71
        if (killAllJsonDb) {
 
72
            if (system("killall jsondb") != 0) {
 
73
                qWarning() << Q_FUNC_INFO << "Unable to kill running jsondb instances.";
 
74
            }
 
75
        }
 
76
 
73
77
        QFileInfo partitionsFileInfo(partitionsFilePath);
74
78
        // Start new process
75
79
        QString jsondbPath = QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/jsondb";