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 <aakash_jain@apple.com> 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.

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

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 9131566..81c4863 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,18 @@
+2015-08-27  Aakash Jain  <aakash_jain@apple.com>
+
+        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  <achristensen@webkit.org>
 
         Make DLLLauncherMain executables dependent on dll

diff --git a/Tools/Scripts/run-api-tests b/Tools/Scripts/run-api-tests
index 0cb74d4..31ad78a 100755 (executable)
--- a/Tools/Scripts/run-api-tests
+++ b/Tools/Scripts/run-api-tests
@@ -103,6 +103,9 @@ setConfigurationProductDir(Cwd::abs_path($root)) if (defined($root));
 
 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 @@ if ($dumpTests) {
     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()

diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
index dcb89eb..2202922 100755 (executable)
--- a/Tools/Scripts/webkitdirs.pm
+++ b/Tools/Scripts/webkitdirs.pm
@@ -80,6 +80,7 @@ BEGIN {
        &setupMacWebKitEnvironment
        &sharedCommandLineOptions
        &sharedCommandLineOptionsUsage
+       SIMULATOR_DEVICE_SUFFIX_FOR_WEBKIT_DEVELOPMENT
        USE_OPEN_COMMAND
    );
    %EXPORT_TAGS = ( );
@@ -90,6 +91,7 @@ use constant USE_OPEN_COMMAND => 1; # Used in runMacWebKitApp().
 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 @@ sub runIOSWebKitAppInSimulator($;$)
     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);