AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Test: remove QSKIP from tst_QProcessEnvironment::putenv

Browse Source 
Instead omit the whole test when Q_OS_WINCE is defined.

Change-Id: I19e35b837709c92e0202c6a96d113367bc6c92c2
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
This commit is contained in:
Caroline Chao 2012-10-16 12:59:06 +02:00 committed by The Qt Project
parent fbd10a401f
commit 26dddabcaa
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp
View File

@ -57,7 +57,9 @@ private slots:
void caseSensitivity(); void caseSensitivity();
void systemEnvironment(); void systemEnvironment();
#ifndef Q_OS_WINCE
void putenv(); void putenv();
#endif
}; };
void tst_QProcessEnvironment::operator_eq() void tst_QProcessEnvironment::operator_eq()
@ -276,11 +278,10 @@ void tst_QProcessEnvironment::systemEnvironment()
#endif #endif
} }
#ifndef Q_OS_WINCE
//Windows CE has no environment
void tst_QProcessEnvironment::putenv() void tst_QProcessEnvironment::putenv()
{ {
#ifdef Q_OS_WINCE
QSKIP("Windows CE has no environment");
#else
static const char envname[] = "WE_RE_SETTING_THIS_ENVIRONMENT_VARIABLE"; static const char envname[] = "WE_RE_SETTING_THIS_ENVIRONMENT_VARIABLE";
static bool testRan = false; static bool testRan = false;
@ -311,8 +312,8 @@ void tst_QProcessEnvironment::putenv()
QVERIFY(eAfter.contains(lower)); QVERIFY(eAfter.contains(lower));
QCOMPARE(eAfter.value(lower), QString("Hello, World")); QCOMPARE(eAfter.value(lower), QString("Hello, World"));
# endif # endif
#endif
} }
#endif
QTEST_MAIN(tst_QProcessEnvironment) QTEST_MAIN(tst_QProcessEnvironment)