Summary: | [Qt] Build overrides -j when given --makeargs="-sj40" | ||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Brendan Long <b.long> | ||||||||
Component: | WebKit Qt | Assignee: | Nobody <webkit-unassigned> | ||||||||
Status: | RESOLVED FIXED | ||||||||||
Severity: | Normal | CC: | b.long, commit-queue, dbates, hausmann, ossy, zeno | ||||||||
Priority: | P2 | ||||||||||
Version: | 528+ (Nightly build) | ||||||||||
Hardware: | Unspecified | ||||||||||
OS: | Unspecified | ||||||||||
Attachments: |
|
Description
Brendan Long
2013-05-28 15:51:31 PDT
Created attachment 203103 [details]
Patch
Basically, if I do Tools/Scripts/build-webkit --qt --debug --makeargs="-sj40", it does this: > Calling 'make -sj40 -j8 incremental' in /home/blong/workspace/webkit/WebKitBuild/Debug With my fix, it does this: > Calling 'make -sj40 incremental' in /home/blong/workspace/webkit/WebKitBuild/Debug If you do `--makeargs="-j40"`, it works as expected: > Calling 'make -j40 incremental' in /home/blong/workspace/webkit/WebKitBuild/Debug Same with `--makeargs="-s"`: > Calling 'make -s -j8 incremental' in /home/blong/workspace/webkit/WebKitBuild/Debug Or without `--makeargs`: > Calling 'make -j8 incremental' in /home/blong/workspace/webkit/WebKitBuild/Debug Oh, and --makeargs="-s -j40" fails too, because the -s is being passed to qmake. I'm not sure how to fix that one though.
> $ gst-git Tools/Scripts/build-webkit --qt --debug --makeargs="-s -j40" --video-track --no-svg --no-webkit2; alert
> Calling 'qmake /home/blong/workspace/webkit/WebKit.pro -j40 WEBKIT_CONFIG-=build_webkit2 WEBKIT_CONFIG-=svg WEBKIT_CONFIG+=video_track CONFIG-=release CONFIG+=debug CONFIG-=production_build' in /home/blong/workspace/webkit/WebKitBuild/Debug
>
> ***Unknown option -j40
CC'ing the last person to change this line. I hope that's not annoying. Comment on attachment 203103 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=203103&action=review > Tools/Scripts/webkitdirs.pm:2227 > - if ($make eq "make" && $makeargs !~ /-j\s*\d+/i && (!defined $ENV{"MAKEFLAGS"} || ($ENV{"MAKEFLAGS"} !~ /-j\s*\d+/i ))) { > + if ($make eq "make" && $makeargs !~ /-[^\s]*?j\s*\d+/i && (!defined $ENV{"MAKEFLAGS"} || ($ENV{"MAKEFLAGS"} !~ /-j\s*\d+/i ))) { LGTM, but please fix the regexp of MAKEFLAGS too. Created attachment 205489 [details]
Fix MAKEFLAGS check
Comment on attachment 205489 [details] Fix MAKEFLAGS check Attachment 205489 [details] did not pass win-ews (win): Output: http://webkit-queues.appspot.com/results/995034 New failing tests: fast/frames/seamless/seamless-nested-crash.html Created attachment 205521 [details]
Archive of layout-test-results from APPLE-EWS-6 for win-future
The attached test failures were seen while running run-webkit-tests on the win-ews.
Bot: APPLE-EWS-6 Port: win-future Platform: CYGWIN_NT-6.1-WOW64-1.7.20-0.266-5-3-i686-32bit
Comment on attachment 205489 [details]
Fix MAKEFLAGS check
r=me
(In reply to comment #3) > Oh, and --makeargs="-s -j40" fails too, because the -s is being passed to qmake. I'm not sure how to fix that one though. > > > $ gst-git Tools/Scripts/build-webkit --qt --debug --makeargs="-s -j40" --video-track --no-svg --no-webkit2; alert > > Calling 'qmake /home/blong/workspace/webkit/WebKit.pro -j40 WEBKIT_CONFIG-=build_webkit2 WEBKIT_CONFIG-=svg WEBKIT_CONFIG+=video_track CONFIG-=release CONFIG+=debug CONFIG-=production_build' in /home/blong/workspace/webkit/WebKitBuild/Debug > > > > ***Unknown option -j40 strange ... I couldn't reproduce this fail, --makeargs="-s -j40" works for me. (In reply to comment #10) > strange ... I couldn't reproduce this fail, --makeargs="-s -j40" works for me. I think it was caused by a change in qmake a month or two ago (I'm using Qt master), but I wouldn't even know where to start on tracking that down. Comment on attachment 205489 [details] Fix MAKEFLAGS check Clearing flags on attachment: 205489 Committed r152104: <http://trac.webkit.org/changeset/152104> All reviewed patches have been landed. Closing bug. |