From ceffc7e0e7d12ae1c78fb8e25a862fa1b1ebb648 Mon Sep 17 00:00:00 2001
From: Jake Petroules <jake.petroules@qt.io>
Date: Fri, 15 Sep 2017 02:09:41 -0700
Subject: Exclude DBus performance test with -no-feature-process

Change-Id: I3e650b21139bd59b1f8386f4abb39aadf85e412f
Reviewed-by: Tuomas Heimonen <tuomas.heimonen@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 tests/benchmarks/dbus/dbus.pro | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'tests/benchmarks')

diff --git a/tests/benchmarks/dbus/dbus.pro b/tests/benchmarks/dbus/dbus.pro
index 989a0db2d4..1254ad95e9 100644
--- a/tests/benchmarks/dbus/dbus.pro
+++ b/tests/benchmarks/dbus/dbus.pro
@@ -1,4 +1,6 @@
 TEMPLATE = subdirs
 SUBDIRS = \
-        qdbusperformance \
         qdbustype
+
+qtConfig(process): SUBDIRS += \
+        qdbusperformance
-- 
cgit v1.2.3


From 2740b9d66819cb44a596644eb5fbb956ffe39b86 Mon Sep 17 00:00:00 2001
From: Jake Petroules <jake.petroules@qt.io>
Date: Fri, 15 Sep 2017 02:05:43 -0700
Subject: Use QT_LSTAT instead of lstat directly

Not all platforms (such as VxWorks) have lstat.

Change-Id: If42f0041f9a6d9bec0a355173c88f28f1819bd57
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 tests/benchmarks/corelib/io/qdiriterator/main.cpp                | 5 +++--
 tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.cpp | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'tests/benchmarks')

diff --git a/tests/benchmarks/corelib/io/qdiriterator/main.cpp b/tests/benchmarks/corelib/io/qdiriterator/main.cpp
index cd5a83e547..e71daccf7d 100644
--- a/tests/benchmarks/corelib/io/qdiriterator/main.cpp
+++ b/tests/benchmarks/corelib/io/qdiriterator/main.cpp
@@ -28,6 +28,7 @@
 #include <QDebug>
 #include <QDirIterator>
 #include <QString>
+#include <qplatformdefs.h>
 
 #ifdef Q_OS_WIN
 #   include <qt_windows.h>
@@ -142,8 +143,8 @@ static int posix_helper(const char *dirpath)
         QByteArray ba = dirpath;
         ba += '/';
         ba += entry->d_name;
-        struct stat st;
-        lstat(ba.constData(), &st);
+        QT_STATBUF st;
+        QT_LSTAT(ba.constData(), &st);
         if (S_ISDIR(st.st_mode))
             count += posix_helper(ba.constData());
     }
diff --git a/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.cpp b/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.cpp
index f5fb13fca6..d68264b78f 100644
--- a/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.cpp
+++ b/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.cpp
@@ -82,6 +82,7 @@
 #include <QtCore/qset.h>
 #include <QtCore/qstack.h>
 #include <QtCore/qvariant.h>
+#include <qplatformdefs.h>
 
 #ifdef Q_OS_WIN
 #   include <windows.h>
@@ -343,8 +344,8 @@ bool QFileSystemIteratorPrivate::advanceHelper()
     QByteArray ba = m_dirPaths.top();
     ba += '/';
     ba += name;
-    struct stat st;
-    lstat(ba.constData(), &st);
+    QT_STATBUF st;
+    QT_LSTAT(ba.constData(), &st);
 
     if (S_ISDIR(st.st_mode)) {
         pushSubDirectory(ba);
-- 
cgit v1.2.3