Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(34)

Issue 1843193002: Reland of move {media,p2p,pc,xmllite,xmpp}_tests.gypi files. (Closed)

Created:
4 years, 8 months ago by kjellander_webrtc
Modified:
4 years, 8 months ago
Reviewers:
pthatcher1
CC:
webrtc-reviews_webrtc.org, tterriberry_mozilla.com, qiang.lu, niklas.enbom, yujie_mao (webrtc), peah-webrtc
Base URL:
https://chromium.googlesource.com/external/webrtc.git@master
Target Ref:
refs/pending/heads/master
Project:
webrtc
Visibility:
Public.

Description

Reland of move {media,p2p,pc,xmllite,xmpp}_tests.gypi files. (patchset #1 id:1 of https://codereview.webrtc.org/1846693002/ ) The re-land moves the isolate build targets for media.gyp and pc.gyp into the include_tests==1 condition. This has been tested in a Chromium checkout and no longer causes the error that was seen after landing https://codereview.webrtc.org/1839763004/ Original issue's description: > Revert of Remove {media,p2p,pc,xmllite,xmpp}_tests.gypi files. (patchset #1 id:1 of https://codereview.webrtc.org/1839763004/ ) > > Reason for revert: > Breaks Chromium: https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Builder/builds/11313/steps/gclient%20runhooks/logs/stdio: > > Updating projects from gyp files... > Using overrides found in /Users/chrome-bot/.gyp/include.gypi > Traceback (most recent call last): > File "src/build/gyp_chromium", line 12, in <module> > execfile(__file__ + '.py') > File "src/build/gyp_chromium.py", line 341, in <module> > sys.exit(main()) > File "src/build/gyp_chromium.py", line 328, in main > gyp_rc = gyp.main(args) > File "/b/build/slave/Mac_Builder/build/src/tools/gyp/pylib/gyp/__init__.py", line 538, in main > return gyp_main(args) > File "/b/build/slave/Mac_Builder/build/src/tools/gyp/pylib/gyp/__init__.py", line 514, in gyp_main > options.duplicate_basename_check) > File "/b/build/slave/Mac_Builder/build/src/tools/gyp/pylib/gyp/__init__.py", line 130, in Load > params['parallel'], params['root_targets']) > File "/b/build/slave/Mac_Builder/build/src/tools/gyp/pylib/gyp/input.py", line 2800, in Load > RemoveLinkDependenciesFromNoneTargets(targets) > File "/b/build/slave/Mac_Builder/build/src/tools/gyp/pylib/gyp/input.py", line 1510, in RemoveLinkDependenciesFromNoneTargets > if targets[t].get('variables', {}).get('link_dependency', 0): > KeyError: '/b/build/slave/Mac_Builder/build/src/third_party/webrtc/media/media.gyp:rtc_media_unittests#target' > Error: Command '/usr/bin/python src/build/gyp_chromium' returned non-zero exit status 1 in /b/build/slave/Mac_Builder/build > Hook '/usr/bin/python src/build/gyp_chromium' took 20.29 secs > > Original issue's description: > > Remove {media,p2p,pc,xmllite,xmpp}_tests.gypi files. > > > > These contributes to circular dependency problems in WebRTC > > since one have to depend on webrtc.gyp in order to depend on > > a target in them. > > > > This reduces the number of cyclic dependencies in WebRTC from 21 > > to 16. > > > > BUG=webrtc:4243 > > NOTRY=True > > NOPRESUBMIT=True > > > > Committed: https://crrev.com/231b69f28dd22f4e2d98e5048f8eaae7b20915e6 > > Cr-Commit-Position: refs/heads/master@{#12166} > > TBR=pthatcher@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:4243 > > Committed: https://crrev.com/72644d2cf6b14bbc4a107f79158eaa225f3196b5 > Cr-Commit-Position: refs/heads/master@{#12167} TBR=pthatcher@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:4243 Committed: https://crrev.com/00984ff68891a18113261c09770650460c9de11b Cr-Commit-Position: refs/heads/master@{#12180}

Patch Set 1 #

Patch Set 2 : Rebased and moved isolate targets into include_tests==1 condition #

Unified diffs Side-by-side diffs Delta from patch set Stats (+361 lines, -440 lines) Patch
M webrtc/api/api_tests.gyp View 1 chunk +1 line, -1 line 0 comments Download
M webrtc/libjingle/xmllite/xmllite.gyp View 1 chunk +21 lines, -1 line 0 comments Download
D webrtc/libjingle/xmllite/xmllite_tests.gypi View 1 chunk +0 lines, -28 lines 0 comments Download
M webrtc/libjingle/xmpp/xmpp.gyp View 1 chunk +31 lines, -1 line 0 comments Download
D webrtc/libjingle/xmpp/xmpp_tests.gypi View 1 chunk +0 lines, -37 lines 0 comments Download
M webrtc/media/media.gyp View 1 1 chunk +186 lines, -0 lines 0 comments Download
D webrtc/media/media_tests.gypi View 1 chunk +0 lines, -174 lines 0 comments Download
A + webrtc/media/rtc_media_unittests.isolate View 1 0 chunks +-1 lines, --1 lines 0 comments Download
M webrtc/p2p/p2p.gyp View 1 chunk +47 lines, -1 line 0 comments Download
D webrtc/p2p/p2p_tests.gypi View 1 chunk +0 lines, -53 lines 0 comments Download
M webrtc/pc/pc.gyp View 1 1 chunk +74 lines, -1 line 0 comments Download
D webrtc/pc/pc_tests.gypi View 1 chunk +0 lines, -61 lines 0 comments Download
A + webrtc/pc/rtc_pc_unittests.isolate View 1 0 chunks +-1 lines, --1 lines 0 comments Download
D webrtc/rtc_media_unittests.isolate View 1 chunk +0 lines, -28 lines 0 comments Download
D webrtc/rtc_pc_unittests.isolate View 1 chunk +0 lines, -22 lines 0 comments Download
M webrtc/webrtc.gyp View 1 chunk +0 lines, -5 lines 0 comments Download
M webrtc/webrtc_tests.gypi View 2 chunks +3 lines, -29 lines 0 comments Download

Messages

Total messages: 8 (4 generated)
kjellander_webrtc
Created Reland of move {media,p2p,pc,xmllite,xmpp}_tests.gypi files.
4 years, 8 months ago (2016-03-30 18:56:14 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1843193002/260001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1843193002/260001
4 years, 8 months ago (2016-03-31 14:23:42 UTC) #4
commit-bot: I haz the power
Committed patchset #2 (id:260001)
4 years, 8 months ago (2016-03-31 14:23:52 UTC) #6
commit-bot: I haz the power
4 years, 8 months ago (2016-03-31 14:23:56 UTC) #8
Message was sent while issue was closed.
Patchset 2 (id:??) landed as
https://crrev.com/00984ff68891a18113261c09770650460c9de11b
Cr-Commit-Position: refs/heads/master@{#12180}

Powered by Google App Engine
This is Rietveld 408576698