From 0e4326d71724285ec6a295ea099a4bd06cd9aa1b Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 26 Apr 2019 09:39:57 +0200 Subject: Remove cruft from testProcessEOF.pro TEMPLATE_PREFIX is gone since Qt 5.0.0. Change-Id: I181962b942191187baf62f13d0abd17e7ebdcce1 Reviewed-by: Kai Koehne --- tests/auto/corelib/io/qprocess/testProcessEOF/testProcessEOF.pro | 2 -- 1 file changed, 2 deletions(-) (limited to 'tests/auto/corelib/io') diff --git a/tests/auto/corelib/io/qprocess/testProcessEOF/testProcessEOF.pro b/tests/auto/corelib/io/qprocess/testProcessEOF/testProcessEOF.pro index ab1394a5c9..6a23e52d95 100644 --- a/tests/auto/corelib/io/qprocess/testProcessEOF/testProcessEOF.pro +++ b/tests/auto/corelib/io/qprocess/testProcessEOF/testProcessEOF.pro @@ -1,6 +1,4 @@ SOURCES = main.cpp CONFIG -= qt CONFIG += cmdline - -win32:!mingw:!equals(TEMPLATE_PREFIX, "vc"):QMAKE_CXXFLAGS += /GS- DESTDIR = ./ -- cgit v1.2.3 From 78d0b6e9756c732bf0a7b02d258313a1d2ab461e Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Fri, 26 Apr 2019 17:47:53 +0200 Subject: Ignore failing test for free space on APFS The file system appears to cache too aggressively, so if the reported storage size doesn't change after flushing to disk, ignore the failure. Change-Id: Iba7dce79591447fac296bfe92c2dc993d36d0c2a Fixes: QTBUG-69868 Reviewed-by: Thiago Macieira --- tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'tests/auto/corelib/io') diff --git a/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp b/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp index 1317489e2f..fe63cecccd 100644 --- a/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp +++ b/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp @@ -195,6 +195,10 @@ void tst_QStorageInfo::tempFile() file.close(); QStorageInfo storage2(file.fileName()); + if (free == storage2.bytesFree() && storage2.fileSystemType() == "apfs") { + QEXPECT_FAIL("", "This test is likely to fail on APFS", Continue); + } + QVERIFY(free != storage2.bytesFree()); } @@ -221,6 +225,9 @@ void tst_QStorageInfo::caching() QCOMPARE(free, storage2.bytesFree()); storage2.refresh(); QCOMPARE(storage1, storage2); + if (free == storage2.bytesFree() && storage2.fileSystemType() == "apfs") { + QEXPECT_FAIL("", "This test is likely to fail on APFS", Continue); + } QVERIFY(free != storage2.bytesFree()); } #endif -- cgit v1.2.3