Title: [255781] trunk/Tools
- Revision
- 255781
- Author
- [email protected]
- Date
- 2020-02-04 17:47:51 -0800 (Tue, 04 Feb 2020)
Log Message
results.webkit.org: Support Internal in run-_javascript_core-tests
https://bugs.webkit.org/show_bug.cgi?id=204095
Rubber-stamped by Aakash Jain.
* Scripts/VCSUtils.pm:
(gitBisectStartBranchForDirectory): Renamed from gitBisectStartBranch.
(gitBranchForDirectory): Compute branch for directory.
(gitBranch): Compute branch for the current git directory.
(commitForDirectory): Add git support.
(gitBisectStartBranch): Renamed to gitBisectStartBranchForDirectory.
* Scripts/run-_javascript_core-tests:
(uploadResults): Check for Internal repository.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (255780 => 255781)
--- trunk/Tools/ChangeLog 2020-02-05 01:46:59 UTC (rev 255780)
+++ trunk/Tools/ChangeLog 2020-02-05 01:47:51 UTC (rev 255781)
@@ -1,3 +1,19 @@
+2020-02-04 Jonathan Bedard <[email protected]>
+
+ results.webkit.org: Support Internal in run-_javascript_core-tests
+ https://bugs.webkit.org/show_bug.cgi?id=204095
+
+ Rubber-stamped by Aakash Jain.
+
+ * Scripts/VCSUtils.pm:
+ (gitBisectStartBranchForDirectory): Renamed from gitBisectStartBranch.
+ (gitBranchForDirectory): Compute branch for directory.
+ (gitBranch): Compute branch for the current git directory.
+ (commitForDirectory): Add git support.
+ (gitBisectStartBranch): Renamed to gitBisectStartBranchForDirectory.
+ * Scripts/run-_javascript_core-tests:
+ (uploadResults): Check for Internal repository.
+
2020-02-04 Alex Christensen <[email protected]>
REGRESSION: (r255611) [ Mac ] 3 lldb tests failing related to HashMap
Modified: trunk/Tools/Scripts/VCSUtils.pm (255780 => 255781)
--- trunk/Tools/Scripts/VCSUtils.pm 2020-02-05 01:46:59 UTC (rev 255780)
+++ trunk/Tools/Scripts/VCSUtils.pm 2020-02-05 01:47:51 UTC (rev 255781)
@@ -62,6 +62,7 @@
&fixChangeLogPatch
&fixSVNPatchForAdditionWithHistory
&gitBranch
+ &gitBranchForDirectory
&gitCommitForSVNRevision
&gitDirectory
&gitHashForDirectory
@@ -108,7 +109,6 @@
our @EXPORT_OK;
-my $gitBranch;
my $gitRoot;
my $isGit;
my $isGitSVN;
@@ -287,9 +287,10 @@
return $result;
}
-sub gitBisectStartBranch()
+sub gitBisectStartBranchForDirectory($)
{
- my $bisectStartFile = File::Spec->catfile(gitDirectory(), "BISECT_START");
+ my ($directory) = @_;
+ my $bisectStartFile = File::Spec->catfile($directory, "BISECT_START");
if (!-f $bisectStartFile) {
return "";
}
@@ -299,22 +300,28 @@
return $result;
}
-sub gitBranch()
+sub gitBranchForDirectory($)
{
- unless (defined $gitBranch) {
- chomp($gitBranch = `git symbolic-ref -q HEAD`);
- my $hasDetachedHead = exitStatus($?);
- if ($hasDetachedHead) {
- # We may be in a git bisect session.
- $gitBranch = gitBisectStartBranch();
- }
- $gitBranch =~ s#^refs/heads/##;
- $gitBranch = "" if $gitBranch eq "master";
+ my ($directory) = @_;
+
+ my $gitBranch;
+ chomp($gitBranch = `git -C \"$directory\" symbolic-ref -q HEAD`);
+ my $hasDetachedHead = exitStatus($?);
+ if ($hasDetachedHead) {
+ # We may be in a git bisect session.
+ $gitBranch = gitBisectStartBranchForDirectory($directory);
}
+ $gitBranch =~ s#^refs/heads/##;
+ $gitBranch = "" if $gitBranch eq "master";
return $gitBranch;
}
+sub gitBranch()
+{
+ return gitBranchForDirectory(gitDirectory());
+}
+
sub isGitBranchBuild()
{
my $branch = gitBranch();
@@ -385,6 +392,10 @@
$info =~ /.*Relative URL: \^\/([a-z]+)\n.*/;
my $branch = $1;
$result->{branch} = $branch if ($branch ne 'trunk');
+ } elsif (isGitDirectory($directory)) {
+ $result->{id} = gitHashForDirectory($directory);
+ my $branch = gitBranchForDirectory($directory);
+ $result->{branch} = $branch if ($branch ne '');
} else {
die "$directory is not a recognized SCM";
}
Modified: trunk/Tools/Scripts/run-_javascript_core-tests (255780 => 255781)
--- trunk/Tools/Scripts/run-_javascript_core-tests 2020-02-05 01:46:59 UTC (rev 255780)
+++ trunk/Tools/Scripts/run-_javascript_core-tests 2020-02-05 01:47:51 UTC (rev 255781)
@@ -878,11 +878,18 @@
return 0;
}
+ my @commits = [];
+ my $internalCheckout = File::Spec->catdir(dirname(sourceDir()), "Internal");
+ if (-e $internalCheckout and -d $internalCheckout) {
+ @commits = [commitForDirectory(sourceDir(), 'webkit'), commitForDirectory($internalCheckout, 'safari')]
+ } else {
+ @commits = [commitForDirectory(sourceDir(), 'webkit')]
+ }
+
my %upload = (
version => 0,
suite => '_javascript_core-tests',
- # FIXME: Integrate the Safari repository, https://bugs.webkit.org/show_bug.cgi?id=204095
- commits => [commitForDirectory(sourceDir(), 'webkit')],
+ commits => @commits,
configuration => configurationForUpload(),
test_results => {
run_stats => {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
