1 files changed, 24 insertions, 43 deletions

diff --git a/tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp b/tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp
index 2766ea51d5..b7056e20c9 100644
--- a/tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp
+++ b/tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp
@@ -1,32 +1,8 @@
-/****************************************************************************
-**
-** Copyright (C) 2021 The Qt Company Ltd.
-** Copyright (C) 2013 David Faure <faure+bluesystems@kde.org>
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2021 The Qt Company Ltd.
+// Copyright (C) 2013 David Faure <faure+bluesystems@kde.org>
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
+#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses
 
 #include <QTest>
 #include <QtConcurrentRun>
@@ -41,6 +17,8 @@
 #include <qsysinfo.h>
 #if defined(Q_OS_UNIX) && !defined(Q_OS_VXWORKS)
 #include <unistd.h>
+
+#include <sys/stat.h> // utimensat
 #include <sys/time.h>
 #elif defined(Q_OS_WIN)
 #  include <qt_windows.h>
@@ -49,6 +27,8 @@
 
 #include <private/qlockfile_p.h>  // for getLockFileHandle()
 
+using namespace std::chrono_literals;
+
 class tst_QLockFile : public QObject
 {
     Q_OBJECT
@@ -119,7 +99,7 @@ void tst_QLockFile::lockUnlock()
     QVERIFY(lockFile.getLockInfo(&pid, &hostname, &appname));
     QCOMPARE(pid, QCoreApplication::applicationPid());
     QCOMPARE(appname, qAppName());
-    QVERIFY(!lockFile.tryLock(200));
+    QVERIFY(!lockFile.tryLock(200ms));
     QCOMPARE(int(lockFile.error()), int(QLockFile::LockFailedError));
 
     // Unlock deletes the lock file
@@ -364,8 +344,8 @@ void tst_QLockFile::staleLongLockFromBusyProcess()
     QTRY_VERIFY(QFile::exists(fileName));
 
     QLockFile secondLock(fileName);
-    secondLock.setStaleLockTime(0);
-    QVERIFY(!secondLock.tryLock(100)); // never stale
+    secondLock.setStaleLockTime(0ms);
+    QVERIFY(!secondLock.tryLock(100ms)); // never stale
     QCOMPARE(int(secondLock.error()), int(QLockFile::LockFailedError));
     qint64 pid;
     QTRY_VERIFY(secondLock.getLockInfo(&pid, NULL, NULL));
@@ -533,15 +513,15 @@ void tst_QLockFile::corruptedLockFile()
     }
 
     QLockFile secondLock(fileName);
-    secondLock.setStaleLockTime(100);
-    QVERIFY(secondLock.tryLock(10000));
+    secondLock.setStaleLockTime(100ms);
+    QVERIFY(secondLock.tryLock(10s));
     QCOMPARE(int(secondLock.error()), int(QLockFile::NoError));
 }
 
 void tst_QLockFile::corruptedLockFileInTheFuture()
 {
-#if !defined(Q_OS_UNIX)
-    QSKIP("This tests needs utimes");
+#if !defined(Q_OS_UNIX) || defined(Q_OS_VXWORKS)
+    QSKIP("This test needs utimensat");
 #else
     // This test is the same as the previous one, but the corruption was so there is a corrupted
     // .rmlock whose timestamp is in the future
@@ -553,11 +533,12 @@ void tst_QLockFile::corruptedLockFileInTheFuture()
         QVERIFY(file.open(QFile::WriteOnly));
     }
 
-    struct timeval times[2];
-    gettimeofday(times, 0);
-    times[1].tv_sec = (times[0].tv_sec += 600);
-    times[1].tv_usec = times[0].tv_usec;
-    utimes(fileName.toLocal8Bit(), times);
+    struct timespec times[2];
+    clock_gettime(CLOCK_REALTIME, times);
+    times[0].tv_sec += 600;
+    times[1].tv_sec = times[0].tv_sec;
+    times[1].tv_nsec = times[0].tv_nsec;
+    utimensat(0 /* ignored */, fileName.toLocal8Bit(), times, 0);
 
     QTest::ignoreMessage(QtInfoMsg, "QLockFile: Lock file '" + fileName.toUtf8() + "' has a modification time in the future");
     corruptedLockFile();
@@ -586,7 +567,7 @@ void tst_QLockFile::hostnameChange()
     {
         // we should fail to lock
         QLockFile lock2(lockFile);
-        QVERIFY(!lock2.tryLock(1000));
+        QVERIFY(!lock2.tryLock(1s));
     }
 }
 
@@ -613,7 +594,7 @@ void tst_QLockFile::differentMachines()
     {
         // we should fail to lock
         QLockFile lock2(lockFile);
-        QVERIFY(!lock2.tryLock(1000));
+        QVERIFY(!lock2.tryLock(1s));
     }
 }
 
@@ -642,7 +623,7 @@ void tst_QLockFile::reboot()
     f.close();
 
     // we should succeed in locking
-    QVERIFY(lock1.tryLock(0));
+    QVERIFY(lock1.tryLock(0ms));
 }
 
 bool tst_QLockFile::overwritePidInLockFile(const QString &filePath, qint64 pid)