[EFL] css3/device-adapt/* tests failed after r190335.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 1 Oct 2015 04:21:13 +0000 (04:21 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 1 Oct 2015 04:21:13 +0000 (04:21 +0000)
https://bugs.webkit.org/show_bug.cgi?id=149655

Patch by Hunseop Jeong <hs85.jeong@samsung.com> on 2015-09-30
Reviewed by Simon Fraser.

device-adapt/* tests need the fixedLayout option but useFixedLayout option is
overwritten by updatePlatformSpecificViewOptionsForTest after r190335.

* WebKitTestRunner/efl/TestControllerEfl.cpp:
(WTR::shouldUseFixedLayout):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@190386 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/WebKitTestRunner/efl/TestControllerEfl.cpp

index f851ad9..9e3678d 100644 (file)
@@ -1,3 +1,16 @@
+2015-09-30  Hunseop Jeong  <hs85.jeong@samsung.com>
+
+        [EFL] css3/device-adapt/* tests failed after r190335.
+        https://bugs.webkit.org/show_bug.cgi?id=149655
+
+        Reviewed by Simon Fraser.
+
+        device-adapt/* tests need the fixedLayout option but useFixedLayout option is
+        overwritten by updatePlatformSpecificViewOptionsForTest after r190335.
+
+        * WebKitTestRunner/efl/TestControllerEfl.cpp:
+        (WTR::shouldUseFixedLayout):
+
 2015-09-30  Dewei Zhu  <dewei_zhu@apple.com>
 
         Extend JetStream timeout for slow devices.
index b4e3150..f0206f5 100644 (file)
@@ -151,7 +151,7 @@ static bool shouldUseFixedLayout(const std::string& pathOrURL)
 
 void TestController::updatePlatformSpecificTestOptionsForTest(TestOptions& testOptions, const std::string& pathOrURL) const
 {
-    testOptions.useFixedLayout = shouldUseFixedLayout(pathOrURL);
+    testOptions.useFixedLayout |= shouldUseFixedLayout(pathOrURL);
 }
 
 void TestController::platformConfigureViewForTest(const TestInvocation&)