Title: [255698] trunk/Tools
- Revision
- 255698
- Author
- [email protected]
- Date
- 2020-02-04 14:17:43 -0800 (Tue, 04 Feb 2020)
Log Message
results.webkit.org: Support branches in run-_javascript_core-tests
https://bugs.webkit.org/show_bug.cgi?id=204094
Rubber-stamped by Aakash Jain.
* Scripts/run-_javascript_core-tests:
(uploadResults): Use webkitdirs function to generate commit information.
* Scripts/VCSUtils.pm:
(commitForDirectory): Generate commit information for SVN repository, including
branch name.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (255697 => 255698)
--- trunk/Tools/ChangeLog 2020-02-04 22:14:03 UTC (rev 255697)
+++ trunk/Tools/ChangeLog 2020-02-04 22:17:43 UTC (rev 255698)
@@ -1,3 +1,16 @@
+2020-02-04 Jonathan Bedard <[email protected]>
+
+ results.webkit.org: Support branches in run-_javascript_core-tests
+ https://bugs.webkit.org/show_bug.cgi?id=204094
+
+ Rubber-stamped by Aakash Jain.
+
+ * Scripts/run-_javascript_core-tests:
+ (uploadResults): Use webkitdirs function to generate commit information.
+ * Scripts/VCSUtils.pm:
+ (commitForDirectory): Generate commit information for SVN repository, including
+ branch name.
+
2020-02-04 Matt Lewis <[email protected]>
Replace bot677 due to hardware failure
Modified: trunk/Tools/Scripts/VCSUtils.pm (255697 => 255698)
--- trunk/Tools/Scripts/VCSUtils.pm 2020-02-04 22:14:03 UTC (rev 255697)
+++ trunk/Tools/Scripts/VCSUtils.pm 2020-02-04 22:17:43 UTC (rev 255698)
@@ -52,6 +52,7 @@
&changeLogEmailAddress
&changeLogName
&chdirReturningRelativePath
+ &commitForDirectory
&decodeGitBinaryChunk
&decodeGitBinaryPatch
&determineSVNRoot
@@ -371,6 +372,25 @@
return File::Spec->abs2rel($previousDirectory, $newDirectory);
}
+sub commitForDirectory($$)
+{
+ my ($directory, $repository) = @_;
+
+ my $result = {
+ repository_id => $repository,
+ };
+ if (isSVNDirectory($directory)) {
+ $result->{id} = svnRevisionForDirectory($directory);
+ my $info = svnInfoForPath($directory);
+ $info =~ /.*Relative URL: \^\/([a-z]+)\n.*/;
+ my $branch = $1;
+ $result->{branch} = $branch if ($branch ne 'trunk');
+ } else {
+ die "$directory is not a recognized SCM";
+ }
+ return $result;
+}
+
sub determineSVNRoot()
{
my $last = '';
Modified: trunk/Tools/Scripts/run-_javascript_core-tests (255697 => 255698)
--- trunk/Tools/Scripts/run-_javascript_core-tests 2020-02-04 22:14:03 UTC (rev 255697)
+++ trunk/Tools/Scripts/run-_javascript_core-tests 2020-02-04 22:17:43 UTC (rev 255698)
@@ -881,12 +881,8 @@
my %upload = (
version => 0,
suite => '_javascript_core-tests',
- # FIXME: Integrate branches, https://bugs.webkit.org/show_bug.cgi?id=204094
# FIXME: Integrate the Safari repository, https://bugs.webkit.org/show_bug.cgi?id=204095
- commits => [{
- repository_id => 'webkit',
- id => determineCurrentSVNRevision(),
- }],
+ commits => [commitForDirectory(sourceDir(), 'webkit')],
configuration => configurationForUpload(),
test_results => {
run_stats => {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
