From: Caroline Chao <caroline.chao@digia.com>
Date: Tue, 16 Oct 2012 10:59:06 +0000 (+0200)
Subject: Test: remove QSKIP from tst_QProcessEnvironment::putenv
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=26dddabcaae2a9e0adf3e960165ae481abf39bc7;p=profile%2Fivi%2Fqtbase.git

Test: remove QSKIP from tst_QProcessEnvironment::putenv

Instead omit the whole test when Q_OS_WINCE is defined.

Change-Id: I19e35b837709c92e0202c6a96d113367bc6c92c2
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
---

diff --git a/tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp b/tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp
index eb3f25d..3826bfc 100644
--- a/tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp
+++ b/tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp
@@ -57,7 +57,9 @@ private slots:
 
     void caseSensitivity();
     void systemEnvironment();
+#ifndef Q_OS_WINCE
     void putenv();
+#endif
 };
 
 void tst_QProcessEnvironment::operator_eq()
@@ -276,11 +278,10 @@ void tst_QProcessEnvironment::systemEnvironment()
 #endif
 }
 
+#ifndef Q_OS_WINCE
+//Windows CE has no environment
 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 bool testRan = false;
 
@@ -311,8 +312,8 @@ void tst_QProcessEnvironment::putenv()
     QVERIFY(eAfter.contains(lower));
     QCOMPARE(eAfter.value(lower), QString("Hello, World"));
 # endif
-#endif
 }
+#endif
 
 QTEST_MAIN(tst_QProcessEnvironment)