Changeset 196212 in webkit

Timestamp:

Feb 5, 2016 11:00:56 PM (8 years ago)

Author:

aakash_jain@apple.com

Message:

tests fail if display sleeps while run-webkit-tests is running
​https://bugs.webkit.org/show_bug.cgi?id=153919

Reviewed by Alexey Proskuryakov.

• DumpRenderTree/mac/LayoutTestHelper.m:

(addDisplaySleepAssertion): Add the assertion so that the display doesn't turn off.
(releaseDisplaySleepAssertion): Release the DisplaySleep Assertion.
(simpleSignalHandler): Release the DisplaySleepAssertion in case of any iterrupt.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/mac/LayoutTestHelper.m (modified) (6 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2016-02-05  Aakash Jain  <aakash_jain@apple.com>
+
+        tests fail if display sleeps while run-webkit-tests is running
+        https://bugs.webkit.org/show_bug.cgi?id=153919
+
+        Reviewed by Alexey Proskuryakov.
+
+        * DumpRenderTree/mac/LayoutTestHelper.m:
+        (addDisplaySleepAssertion): Add the assertion so that the display doesn't turn off.
+        (releaseDisplaySleepAssertion): Release the DisplaySleep Assertion.
+        (simpleSignalHandler): Release the DisplaySleepAssertion in case of any iterrupt.
+
 2016-02-05  Alex Christensen  <achristensen@webkit.org>
 

trunk/Tools/DumpRenderTree/mac/LayoutTestHelper.m

@@ -34 +34 @@
 #import <AppKit/AppKit.h>
 #import <ApplicationServices/ApplicationServices.h>
+#import <IOKit/pwr_mgt/IOPMLib.h>
 #import <getopt.h>
 #import <signal.h>
@@ -45 +46 @@
 
 static int installColorProfile = false;
+static uint32_t assertionID = 0;
 
 static NSMutableDictionary *originalColorProfileURLs()
@@ -192 +194 @@
 }
 
+static void releaseDisplaySleepAssertion()
+{
+    IOPMAssertionRelease(assertionID);
+}
+
 static void simpleSignalHandler(int sig)
 {
     // Try to restore the color profile and try to go down cleanly
     restoreUserColorProfile();
+    releaseDisplaySleepAssertion();
     exit(128 + sig);
 }
@@ -229 +237 @@
     if (kernResult != KERN_SUCCESS)
         NSLog(@"IOObjectRelease() failed in %s with kernResult = %d", __FUNCTION__, kernResult);
+}
+
+void addDisplaySleepAssertion() 
+{
+    CFStringRef assertionName = CFSTR("WebKit LayoutTestHelper");
+    CFStringRef assertionDetails = CFSTR("WebKit layout-test helper tool is preventing sleep.");
+    IOPMAssertionCreateWithDescription(kIOPMAssertionTypePreventUserIdleDisplaySleep,
+        assertionName, assertionDetails, assertionDetails, NULL, 0, NULL, &assertionID);
 }
 
@@ -252 +268 @@
     signal(SIGTERM, simpleSignalHandler);
 
+    addDisplaySleepAssertion();
     lockDownDiscreteGraphics();
 
@@ -266 +283 @@
     // Restore the profile
     restoreUserColorProfile();
+    releaseDisplaySleepAssertion();
 
     return 0;