2 files changed, 34 insertions, 12 deletions

diff --git a/tests/auto/corelib/ipc/qsharedmemory/tst_qsharedmemory.cpp b/tests/auto/corelib/ipc/qsharedmemory/tst_qsharedmemory.cpp
index 1023b3c888..44f5cee82d 100644
--- a/tests/auto/corelib/ipc/qsharedmemory/tst_qsharedmemory.cpp
+++ b/tests/auto/corelib/ipc/qsharedmemory/tst_qsharedmemory.cpp
@@ -20,12 +20,13 @@
 
 #include "private/qtcore-config_p.h"
 
-#define EXISTING_SHARE "existing"
 #define EXISTING_SIZE 1024
 
 Q_DECLARE_METATYPE(QSharedMemory::SharedMemoryError)
 Q_DECLARE_METATYPE(QSharedMemory::AccessMode)
 
+using namespace Qt::StringLiterals;
+
 class tst_QSharedMemory : public QObject
 {
     Q_OBJECT
@@ -81,10 +82,18 @@ private slots:
 protected:
     void remove(const QNativeIpcKey &key);
 
+    QString mangleKey(QStringView key)
+    {
+        if (key.isEmpty())
+            return key.toString();
+        return u"tstshm_%1-%2_%3"_s.arg(QCoreApplication::applicationPid())
+                .arg(seq).arg(key);
+    }
+
     QNativeIpcKey platformSafeKey(const QString &key)
     {
         QNativeIpcKey::Type keyType = QNativeIpcKey::DefaultTypeForOs;
-        return QSharedMemory::platformSafeKey(key, keyType);
+        return QSharedMemory::platformSafeKey(mangleKey(key), keyType);
     }
 
     QNativeIpcKey rememberKey(const QString &key)
@@ -100,6 +109,7 @@ protected:
     QList<QNativeIpcKey> keys;
     QList<QSharedMemory*> jail;
     QSharedMemory *existingSharedMemory;
+    int seq = 0;
 
 private:
     const QString m_helperBinary;
@@ -117,7 +127,7 @@ tst_QSharedMemory::~tst_QSharedMemory()
 
 void tst_QSharedMemory::init()
 {
-    QNativeIpcKey key = platformSafeKey(EXISTING_SHARE);
+    QNativeIpcKey key = platformSafeKey("existing");
     existingSharedMemory = new QSharedMemory(key);
     if (!existingSharedMemory->create(EXISTING_SIZE)) {
         QCOMPARE(existingSharedMemory->error(), QSharedMemory::AlreadyExists);
@@ -138,9 +148,10 @@ void tst_QSharedMemory::cleanup()
             //    qWarning() << "test cleanup: remove failed:" << keys.at(i) << sm.error() << sm.errorString();
             sm.attach();
             sm.detach();
-            remove(keys.at(i));
         }
+        remove(keys.at(i));
     }
+    ++seq;
 }
 
 #if QT_CONFIG(posix_shm)
@@ -320,7 +331,7 @@ void tst_QSharedMemory::create_data()
         << false << QSharedMemory::InvalidSize;
     QTest::newRow("nor size") << QString("norsize") << 1024
         << true << QSharedMemory::NoError;
-    QTest::newRow("already exists") << QString(EXISTING_SHARE) << EXISTING_SIZE
+    QTest::newRow("existing") << QString("existing") << EXISTING_SIZE
         << false << QSharedMemory::AlreadyExists;
 }
 
@@ -359,7 +370,7 @@ void tst_QSharedMemory::attach_data()
     QTest::newRow("null") << QString() << false << QSharedMemory::KeyError;
     QTest::newRow("doesntexists") << QString("doesntexist") << false << QSharedMemory::NotFound;
 
-    QTest::newRow(EXISTING_SHARE) << QString(EXISTING_SHARE) << true << QSharedMemory::NoError;
+    QTest::newRow("existing") << QString("existing") << true << QSharedMemory::NoError;
 }
 
 /*!
diff --git a/tests/auto/corelib/ipc/qsystemsemaphore/tst_qsystemsemaphore.cpp b/tests/auto/corelib/ipc/qsystemsemaphore/tst_qsystemsemaphore.cpp
index 7e5ba91cba..685dda71c7 100644
--- a/tests/auto/corelib/ipc/qsystemsemaphore/tst_qsystemsemaphore.cpp
+++ b/tests/auto/corelib/ipc/qsystemsemaphore/tst_qsystemsemaphore.cpp
@@ -11,9 +11,10 @@
 #include <QtCore/QSystemSemaphore>
 #include <QtCore/QTemporaryDir>
 
-#define EXISTING_SHARE "existing"
 #define HELPERWAITTIME 10000
 
+using namespace Qt::StringLiterals;
+
 class tst_QSystemSemaphore : public QObject
 {
     Q_OBJECT
@@ -21,10 +22,18 @@ class tst_QSystemSemaphore : public QObject
 public:
     tst_QSystemSemaphore();
 
+    QString mangleKey(QStringView key)
+    {
+        if (key.isEmpty())
+            return key.toString();
+        return u"tstsyssem_%1-%2_%3"_s.arg(QCoreApplication::applicationPid())
+                .arg(seq).arg(key);
+    }
+
     QNativeIpcKey platformSafeKey(const QString &key)
     {
         QNativeIpcKey::Type keyType = QNativeIpcKey::DefaultTypeForOs;
-        return QSystemSemaphore::platformSafeKey(key, keyType);
+        return QSystemSemaphore::platformSafeKey(mangleKey(key), keyType);
     }
 
 public Q_SLOTS:
@@ -50,6 +59,7 @@ private slots:
     void initialValue();
 
 private:
+    int seq = 0;
     QSystemSemaphore *existingLock;
 
     const QString m_helperBinary;
@@ -62,13 +72,14 @@ tst_QSystemSemaphore::tst_QSystemSemaphore()
 
 void tst_QSystemSemaphore::init()
 {
-    QNativeIpcKey key = platformSafeKey(EXISTING_SHARE);
+    QNativeIpcKey key = platformSafeKey("existing");
     existingLock = new QSystemSemaphore(key, 1, QSystemSemaphore::Create);
 }
 
 void tst_QSystemSemaphore::cleanup()
 {
     delete existingLock;
+    ++seq;
 }
 
 void tst_QSystemSemaphore::nativeKey_data()
@@ -123,7 +134,7 @@ QT_WARNING_POP
 
 void tst_QSystemSemaphore::basicacquire()
 {
-    QNativeIpcKey key = platformSafeKey("QSystemSemaphore_basicacquire");
+    QNativeIpcKey key = platformSafeKey("basicacquire");
     QSystemSemaphore sem(key, 1, QSystemSemaphore::Create);
     QVERIFY(sem.acquire());
     QCOMPARE(sem.error(), QSystemSemaphore::NoError);
@@ -134,7 +145,7 @@ void tst_QSystemSemaphore::basicacquire()
 
 void tst_QSystemSemaphore::complexacquire()
 {
-    QNativeIpcKey key = platformSafeKey("QSystemSemaphore_complexacquire");
+    QNativeIpcKey key = platformSafeKey("complexacquire");
     QSystemSemaphore sem(key, 2, QSystemSemaphore::Create);
     QVERIFY(sem.acquire());
     QCOMPARE(sem.error(), QSystemSemaphore::NoError);
@@ -157,7 +168,7 @@ void tst_QSystemSemaphore::complexacquire()
 
 void tst_QSystemSemaphore::release()
 {
-    QNativeIpcKey key = platformSafeKey("QSystemSemaphore_release");
+    QNativeIpcKey key = platformSafeKey("release");
     QSystemSemaphore sem(key, 0, QSystemSemaphore::Create);
     QVERIFY(sem.release());
     QCOMPARE(sem.error(), QSystemSemaphore::NoError);