From b8f96418ed625b4acd0f2584d1d9bc065321677c Mon Sep 17 00:00:00 2001 From: Bernd Weimer Date: Tue, 13 May 2014 11:14:32 +0200 Subject: Skip some qsavefile auto tests Some of the QSaveFile tests are not applicable with root privileges. Change-Id: I1a22906c0b14acf144f1849719152dfe9d79f426 Reviewed-by: David Faure --- tests/auto/corelib/io/qsavefile/tst_qsavefile.cpp | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/auto/corelib/io/qsavefile/tst_qsavefile.cpp b/tests/auto/corelib/io/qsavefile/tst_qsavefile.cpp index 04c083e653..87bcfe572d 100644 --- a/tests/auto/corelib/io/qsavefile/tst_qsavefile.cpp +++ b/tests/auto/corelib/io/qsavefile/tst_qsavefile.cpp @@ -47,9 +47,8 @@ #include #include -#if defined(Q_OS_UNIX) -# include // for geteuid -# include +#if defined(Q_OS_UNIX) && !defined(Q_OS_VXWORKS) +#include // for geteuid #endif #if defined(Q_OS_WIN) @@ -199,6 +198,10 @@ void tst_QSaveFile::transactionalWriteNoPermissionsOnDir_data() void tst_QSaveFile::transactionalWriteNoPermissionsOnDir() { #ifdef Q_OS_UNIX +#if !defined(Q_OS_VXWORKS) + if (::geteuid() == 0) + QSKIP("Test is not applicable with root privileges"); +#endif QFETCH(bool, directWriteFallback); QTemporaryDir dir; QVERIFY(dir.isValid()); @@ -253,6 +256,10 @@ void tst_QSaveFile::transactionalWriteNoPermissionsOnDir() void tst_QSaveFile::transactionalWriteNoPermissionsOnFile() { +#if defined(Q_OS_UNIX) && !defined(Q_OS_VXWORKS) + if (::geteuid() == 0) + QSKIP("Test is not applicable with root privileges"); +#endif // Setup an existing but readonly file QTemporaryDir dir; QVERIFY(dir.isValid()); @@ -299,6 +306,10 @@ void tst_QSaveFile::transactionalWriteCanceled() void tst_QSaveFile::transactionalWriteErrorRenaming() { +#if defined(Q_OS_UNIX) && !defined(Q_OS_VXWORKS) + if (::geteuid() == 0) + QSKIP("Test is not applicable with root privileges"); +#endif QTemporaryDir dir; QVERIFY(dir.isValid()); const QString targetFile = dir.path() + QString::fromLatin1("/outfile"); -- cgit v1.2.3