Title: [189078] trunk/Tools
- Revision
- 189078
- Author
- [email protected]
- Date
- 2015-08-27 17:36:24 -0700 (Thu, 27 Aug 2015)
Log Message
iOS Simulator API tests fails as Simulator is not running
https://bugs.webkit.org/show_bug.cgi?id=148501
rdar://problem/22447525
Patch by Aakash Jain <[email protected]> on 2015-08-27
Reviewed by Daniel Bates.
This change is a workaround for <rdar://problem/22388812>.
* Scripts/run-api-tests: Launch the iOS Simulator before starting the API Tests
and quit it on program termination when running tests on the iOS port.
* Scripts/webkitdirs.pm: Store string "For WebKit Development" in constant
SIMULATOR_DEVICE_SUFFIX_FOR_WEBKIT_DEVELOPMENT to make it consistently reusable.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (189077 => 189078)
--- trunk/Tools/ChangeLog 2015-08-28 00:20:06 UTC (rev 189077)
+++ trunk/Tools/ChangeLog 2015-08-28 00:36:24 UTC (rev 189078)
@@ -1,3 +1,18 @@
+2015-08-27 Aakash Jain <[email protected]>
+
+ iOS Simulator API tests fails as Simulator is not running
+ https://bugs.webkit.org/show_bug.cgi?id=148501
+ rdar://problem/22447525
+
+ Reviewed by Daniel Bates.
+
+ This change is a workaround for <rdar://problem/22388812>.
+
+ * Scripts/run-api-tests: Launch the iOS Simulator before starting the API Tests
+ and quit it on program termination when running tests on the iOS port.
+ * Scripts/webkitdirs.pm: Store string "For WebKit Development" in constant
+ SIMULATOR_DEVICE_SUFFIX_FOR_WEBKIT_DEVELOPMENT to make it consistently reusable.
+
2015-08-27 Alex Christensen <[email protected]>
Make DLLLauncherMain executables dependent on dll
Modified: trunk/Tools/Scripts/run-api-tests (189077 => 189078)
--- trunk/Tools/Scripts/run-api-tests 2015-08-28 00:20:06 UTC (rev 189077)
+++ trunk/Tools/Scripts/run-api-tests 2015-08-28 00:36:24 UTC (rev 189078)
@@ -103,6 +103,9 @@
buildTestTool() if $build && !defined($root);
setPathForRunningWebKitApp(\%ENV);
+
+# FIXME: We launch (and quit) iOS Simulator as a workaround for <rdar://problem/22388812>.
+relaunchIOSSimulator(findOrCreateSimulatorForIOSDevice(SIMULATOR_DEVICE_SUFFIX_FOR_WEBKIT_DEVELOPMENT)) if willUseIOSSimulatorSDKWhenBuilding();
my @testsToRun = listAllTests();
@testsToRun = grep { my $test = $_; grep { $test =~ m/^\Q$_\E/ } @ARGV; } @testsToRun if @ARGV;
@@ -112,6 +115,9 @@
exit 0;
}
+# FIXME: We launch (and quit) iOS Simulator as a workaround for <rdar://problem/22388812>.
+END { quitIOSSimulator() if willUseIOSSimulatorSDKWhenBuilding(); }
+
exit runTestsBySuite(@testsToRun);
sub isSupportedPlatform()
Modified: trunk/Tools/Scripts/webkitdirs.pm (189077 => 189078)
--- trunk/Tools/Scripts/webkitdirs.pm 2015-08-28 00:20:06 UTC (rev 189077)
+++ trunk/Tools/Scripts/webkitdirs.pm 2015-08-28 00:36:24 UTC (rev 189078)
@@ -80,6 +80,7 @@
&setupMacWebKitEnvironment
&sharedCommandLineOptions
&sharedCommandLineOptionsUsage
+ SIMULATOR_DEVICE_SUFFIX_FOR_WEBKIT_DEVELOPMENT
USE_OPEN_COMMAND
);
%EXPORT_TAGS = ( );
@@ -90,6 +91,7 @@
use constant INCLUDE_OPTIONS_FOR_DEBUGGING => 1;
use constant SIMULATOR_DEVICE_STATE_SHUTDOWN => "1";
use constant SIMULATOR_DEVICE_STATE_BOOTED => "3";
+use constant SIMULATOR_DEVICE_SUFFIX_FOR_WEBKIT_DEVELOPMENT => "For WebKit Development";
our @EXPORT_OK;
@@ -2237,7 +2239,7 @@
my $productDir = productDir();
my $appDisplayName = appDisplayNameFromBundle($appBundle);
my $appIdentifier = appIdentifierFromBundle($appBundle);
- my $simulatedDevice = findOrCreateSimulatorForIOSDevice("For WebKit Development");
+ my $simulatedDevice = findOrCreateSimulatorForIOSDevice(SIMULATOR_DEVICE_SUFFIX_FOR_WEBKIT_DEVELOPMENT);
my $simulatedDeviceUDID = $simulatedDevice->{UDID};
my $willUseSystemInstalledApp = isIOSSimulatorSystemInstalledApp($appBundle);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
