From d093683119cb045f116d96309493d08005ad27e1 Mon Sep 17 00:00:00 2001 From: Tatiana Borisova Date: Tue, 28 Sep 2021 17:48:54 +0300 Subject: [PATCH] Compile private Qt APIs autotests for INTEGRITY - getgrgid/getpwuid are not supported - the default constructor of "ObserverOrUninit" must be referenced for GHS compiler Task-number: QTBUG-96176 Pick-to: 6.2 Change-Id: I24093da76e116aba4b87a8f5c5763b03d082a2cd Reviewed-by: Edward Welbourne --- tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp | 4 ++-- tests/auto/corelib/kernel/qproperty/tst_qproperty.cpp | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp index 0720beb238..9e4fd9d064 100644 --- a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp +++ b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp @@ -2063,7 +2063,7 @@ bool IsUserAdmin() void tst_QFileInfo::owner() { QString userName; -#if defined(Q_OS_UNIX) && !defined(Q_OS_VXWORKS) +#if defined(Q_OS_UNIX) && !defined(Q_OS_VXWORKS) && !defined(Q_OS_INTEGRITY) { passwd *user = getpwuid(geteuid()); QVERIFY(user); @@ -2125,7 +2125,7 @@ void tst_QFileInfo::owner() void tst_QFileInfo::group() { QString expected; -#if defined(Q_OS_UNIX) && !defined(Q_OS_VXWORKS) +#if defined(Q_OS_UNIX) && !defined(Q_OS_VXWORKS) && !defined(Q_OS_INTEGRITY) struct group *gr; gid_t gid = getegid(); diff --git a/tests/auto/corelib/kernel/qproperty/tst_qproperty.cpp b/tests/auto/corelib/kernel/qproperty/tst_qproperty.cpp index cc2bac8e2b..f386c0473b 100644 --- a/tests/auto/corelib/kernel/qproperty/tst_qproperty.cpp +++ b/tests/auto/corelib/kernel/qproperty/tst_qproperty.cpp @@ -1454,6 +1454,7 @@ void tst_QProperty::modifyObserverListWhileIterating() DestructingObserver observer = {}; char* memory; ~ObserverOrUninit() {} + ObserverOrUninit() {} }; { // observer deletes itself while running the notification