From 4fc515de4ec4b30365040d5144b1e7c0cd41906d Mon Sep 17 00:00:00 2001 From: Caroline Chao Date: Tue, 16 Oct 2012 15:08:35 +0200 Subject: [PATCH] Test: remove QSKIP from tst_LargeFile::mapOffsetOverflow Instead omit the whole test when Q_OS_MAC is defined. Change-Id: I7d35c99ecd69b3c5bb8f8590342edd9665300709 Reviewed-by: J-P Nurmi Reviewed-by: Sergio Ahumada --- tests/auto/corelib/io/largefile/tst_largefile.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/auto/corelib/io/largefile/tst_largefile.cpp b/tests/auto/corelib/io/largefile/tst_largefile.cpp index 25b3c05beb..ce5da82c82 100644 --- a/tests/auto/corelib/io/largefile/tst_largefile.cpp +++ b/tests/auto/corelib/io/largefile/tst_largefile.cpp @@ -121,7 +121,9 @@ private slots: // Map/unmap large file void mapFile(); +#ifndef Q_OS_MAC void mapOffsetOverflow(); +#endif void closeFile() { largeFile.close(); } @@ -510,12 +512,10 @@ void tst_LargeFile::mapFile() QVERIFY( largeFile.unmap( baseAddress ) ); } +//Mac: memory-mapping beyond EOF may succeed but it could generate bus error on access +#ifndef Q_OS_MAC void tst_LargeFile::mapOffsetOverflow() { -#if defined(Q_OS_MAC) - QSKIP("mmap'ping beyond EOF may succeed; generate bus error on access"); -#endif - // Out-of-range mappings should fail, and not silently clip the offset for (int i = 50; i < 63; ++i) { uchar *address = 0; @@ -530,6 +530,7 @@ void tst_LargeFile::mapOffsetOverflow() QVERIFY( !address ); } } +#endif QTEST_APPLESS_MAIN(tst_LargeFile) #include "tst_largefile.moc"