update_webgl_conformance_tests.py fails to detect the SCM being used

• Component: Tools / Tests
• Status: RESOLVED FIXED

[Ehsan Akhgari [:ehsan]]

This is caused by detect_scm_system no longer being exported from the scm module.

[Ehsan Akhgari [:ehsan]]

Created attachment 124790 [details]
Patch

[WebKit Review Bot]

Attachment 124790 [details] did not pass style-queue:

Failed to run "['Tools/Scripts/update-webkit']" exit_code: 9

Updating OpenSource
From git://git.webkit.org/WebKit
   b20e8a8..0d303ad  master     -> origin/master
Partial-rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ...
Currently at 106376 = b20e8a895f05dd841cd264088d3b83af0e98a788
r106377 = 0d303add2919f49b485767126a3a9ddd6d40b7cf
Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc
First, rewinding head to replay your work on top of it...
Applying: Fix compilation errors on build-webkit --debug --no-workers on mac.
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging LayoutTests/ChangeLog
CONFLICT (content): Merge conflict in LayoutTests/ChangeLog
Auto-merging LayoutTests/platform/qt/Skipped
CONFLICT (content): Merge conflict in LayoutTests/platform/qt/Skipped
Auto-merging Source/WebCore/ChangeLog
CONFLICT (content): Merge conflict in Source/WebCore/ChangeLog
Auto-merging Source/WebCore/WebCore.exp.in
Auto-merging Source/WebKit/mac/ChangeLog
CONFLICT (content): Merge conflict in Source/WebKit/mac/ChangeLog
Failed to merge in the changes.
Patch failed at 0001 Fix compilation errors on build-webkit --debug --no-workers on mac.

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".

rebase refs/remotes/origin/master: command returned error: 1

Died at Tools/Scripts/update-webkit line 164.


If any of these errors are false positives, please file a bug against check-webkit-style.

[Kenneth Russell]

Comment on attachment 124790 [details]
Patch

Thanks, looks good. r=me

[Kenneth Russell]

I'm assuming you wanted this submitted to the commit queue. Please mark patches cq? for this in the future.

[Ehsan Akhgari [:ehsan]]

(In reply to comment #4)
> I'm assuming you wanted this submitted to the commit queue. Please mark patches cq? for this in the future.

Sure.  This is my first patch to webkit, and I don't know a lot about the workflow here.  :-)

[WebKit Review Bot]

Comment on attachment 124790 [details]
Patch

Clearing flags on attachment: 124790

Committed r106404: <http://trac.webkit.org/changeset/106404>

[WebKit Review Bot]

All reviewed patches have been landed.  Closing bug.