Fix GetPrimarySolutionPath() to not include buildtools

Fix GetPrimarySolutionPath() to not include buildtools

GetPrimarySolutionPath() is used by GetBuildtoolsPath() to locate
the chromium/src directory, its return value shouldn't include
'buildtools', since GetBuildtoolsPath() will append another one to
it.

Introduced by https://codereview.chromium.org/933383002

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=294894

[Jiang Jiang, 2015-04-13 12:21:19]

jiangj@opera.com changed reviewers:
+ jochen@chromium.org

[Jiang Jiang, 2015-04-13 12:21:20]

PTAL.

[jochen (gone - plz use gerrit), 2015-04-13 13:14:04]

the bug was actually introduced in https://codereview.chromium.org/933383002

anyway, lgtm

[Jiang Jiang, 2015-04-13 13:17:37]

On 2015/04/13 13:14:04, jochen wrote:
> the bug was actually introduced in https://codereview.chromium.org/933383002
> 
> anyway, lgtm

Thanks, I have corrected the link.

[Jiang Jiang, 2015-04-13 13:17:40]

The CQ bit was checked by jiangj@opera.com

[commit-bot: I haz the power, 2015-04-13 13:17:53]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1072973003/1

[commit-bot: I haz the power, 2015-04-13 13:20:58]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-04-13 13:20:59]

Presubmit check for 1072973003-1 failed and returned exit status 1.

Running presubmit commit checks ...
Checking out rietveld...
Running save-description-on-failure.sh
Running push-basic.sh
Running upstream.sh
Running submit-from-new-dir.sh
Running abandon.sh
Running submodule-merge-test.sh
Running upload-local-tracking-branch.sh
Running hooks.sh
Running post-dcommit-hook-test.sh
Running upload-stale.sh
Running patch.sh
Running basic.sh

** Presubmit ERRORS **
tests/git_cl_test.py (0.58s) failed
.......ERROR: Gerrit commit-msg hook not available.
..ERROR:root:@11  Expected: (['git', 'config', 'branch.master.rietveldissue'],) 
 Actual: (['git', 'rev-parse', '--verify', 'fake_ancestor_sha'],)
FERROR:root:@11  Expected: (['git', 'config', 'branch.master.rietveldissue'],)  
Actual: (['git', 'rev-parse', '--verify', 'fake_ancestor_sha'],)
FERROR:root:@11  Expected: (['git', 'config', 'branch.master.rietveldissue'],)  
Actual: (['git', 'rev-parse', '--verify', 'fake_ancestor_sha'],)
FERROR:root:@11  Expected: (['git', 'config', 'branch.master.rietveldissue'],)  
Actual: (['git', 'rev-parse', '--verify', 'fake_ancestor_sha'],)
FERROR:root:@11  Expected: (['git', 'config', 'branch.master.rietveldissue'],)  
Actual: (['git', 'rev-parse', '--verify', 'fake_ancestor_sha'],)
FERROR:root:@11  Expected: (['git', 'config', 'branch.master.rietveldissue'],)  
Actual: (['git', 'rev-parse', '--verify', 'fake_ancestor_sha'],)
FERROR:root:@11  Expected: (['git', 'config', 'branch.master.rietveldissue'],)  
Actual: (['git', 'rev-parse', '--verify', 'fake_ancestor_sha'],)
FERROR:root:@11  Expected: (['git', 'config', 'branch.master.rietveldissue'],)  
Actual: (['git', 'rev-parse', '--verify', 'fake_ancestor_sha'],)
FERROR:root:@11  Expected: (['git', 'config', 'branch.master.rietveldissue'],)  
Actual: (['git', 'rev-parse', '--verify', 'fake_ancestor_sha'],)
F.
======================================================================
FAIL: test_keep_find_copies (__main__.TestGitCl)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/git_cl_test.py", line 449, in test_keep_find_copies
    [])
  File "tests/git_cl_test.py", line 425, in _run_reviewer_test
    git_cl.main(['upload'] + upload_args)
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 3190, in main
    return dispatcher.execute(OptionParser(), argv)
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/subcommand.py",
line 252, in execute
    return command(parser, args[1:])
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 2075, in CMDupload
    change = cl.GetChange(base_branch, None)
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 845, in GetChange
    if not self.GitSanityChecks(upstream_branch):
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 662, in GitSanityChecks
    upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 102, in RunGit
    return RunCommand(['git'] + args, **kwargs)
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 90, in RunCommand
    return subprocess2.check_output(args, shell=False, **kwargs)
  File "tests/git_cl_test.py", line 118, in _mocked_call
    self.fail(msg)
AssertionError: @11  Expected: (['git', 'config',
'branch.master.rietveldissue'],)   Actual: (['git', 'rev-parse', '--verify',
'fake_ancestor_sha'],)

======================================================================
FAIL: test_keep_similarity (__main__.TestGitCl)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/git_cl_test.py", line 441, in test_keep_similarity
    [])
  File "tests/git_cl_test.py", line 425, in _run_reviewer_test
    git_cl.main(['upload'] + upload_args)
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 3190, in main
    return dispatcher.execute(OptionParser(), argv)
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/subcommand.py",
line 252, in execute
    return command(parser, args[1:])
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 2075, in CMDupload
    change = cl.GetChange(base_branch, None)
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 845, in GetChange
    if not self.GitSanityChecks(upstream_branch):
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 662, in GitSanityChecks
    upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 102, in RunGit
    return RunCommand(['git'] + args, **kwargs)
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 90, in RunCommand
    return subprocess2.check_output(args, shell=False, **kwargs)
  File "tests/git_cl_test.py", line 118, in _mocked_call
    self.fail(msg)
AssertionError: @11  Expected: (['git', 'config',
'branch.master.rietveldissue'],)   Actual: (['git', 'rev-parse', '--verify',
'fake_ancestor_sha'],)

======================================================================
FAIL: test_no_reviewer (__main__.TestGitCl)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/git_cl_test.py", line 433, in test_no_reviewer
    [])
  File "tests/git_cl_test.py", line 425, in _run_reviewer_test
    git_cl.main(['upload'] + upload_args)
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 3190, in main
    return dispatcher.execute(OptionParser(), argv)
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/subcommand.py",
line 252, in execute
    return command(parser, args[1:])
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 2075, in CMDupload
    change = cl.GetChange(base_branch, None)
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 845, in GetChange
    if not self.GitSanityChecks(upstream_branch):
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 662, in GitSanityChecks
    upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 102, in RunGit
    return RunCommand(['git'] + args, **kwargs)
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 90, in RunCommand
    return subprocess2.check_output(args, shell=False, **kwargs)
  File "tests/git_cl_test.py", line 118, in _mocked_call
    self.fail(msg)
AssertionError: @11  Expected: (['git', 'config',
'branch.master.rietveldissue'],)   Actual: (['git', 'rev-parse', '--verify',
'fake_ancestor_sha'],)

======================================================================
FAIL: test_private (__main__.TestGitCl)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/git_cl_test.py", line 457, in test_private
    [])
  File "tests/git_cl_test.py", line 425, in _run_reviewer_test
    git_cl.main(['upload'] + upload_args)
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 3190, in main
    return dispatcher.execute(OptionParser(), argv)
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/subcommand.py",
line 252, in execute
    return command(parser, args[1:])
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 2075, in CMDupload
    change = cl.GetChange(base_branch, None)
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 845, in GetChange
    if not self.GitSanityChecks(upstream_branch):
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 662, in GitSanityChecks
    upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 102, in RunGit
    return RunCommand(['git'] + args, **kwargs)
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 90, in RunCommand
    return subprocess2.check_output(args, shell=False, **kwargs)
  File "tests/git_cl_test.py", line 118, in _mocked_call
    self.fail(msg)
AssertionError: @11  Expected: (['git', 'config',
'branch.master.rietveldissue'],)   Actual: (['git', 'rev-parse', '--verify',
'fake_ancestor_sha'],)

======================================================================
FAIL: test_reviewer_multiple (__main__.TestGitCl)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/git_cl_test.py", line 489, in test_reviewer_multiple
    ['--reviewers=another@example.com,reviewer@example.com'])
  File "tests/git_cl_test.py", line 425, in _run_reviewer_test
    git_cl.main(['upload'] + upload_args)
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 3190, in main
    return dispatcher.execute(OptionParser(), argv)
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/subcommand.py",
line 252, in execute
    return command(parser, args[1:])
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 2075, in CMDupload
    change = cl.GetChange(base_branch, None)
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 845, in GetChange
    if not self.GitSanityChecks(upstream_branch):
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 662, in GitSanityChecks
    upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git…
(message too large)

[Jiang Jiang, 2015-04-13 13:25:50]

On 2015/04/13 13:20:59, I haz the power (commit-bot) wrote:
> Presubmit check for 1072973003-1 failed and returned exit status 1.

Any idea what's going on here?

[Jiang Jiang, 2015-04-14 16:16:31]

On 2015/04/13 13:25:50, Jiang Jiang wrote:
> On 2015/04/13 13:20:59, I haz the power (commit-bot) wrote:
> > Presubmit check for 1072973003-1 failed and returned exit status 1.
> 
> Any idea what's going on here?

ping

[Jiang Jiang, 2015-04-14 16:16:59]

jiangj@opera.com changed reviewers:
+ iannucci@chromium.org

[Jiang Jiang, 2015-04-15 07:37:15]

The CQ bit was checked by jiangj@opera.com to run a CQ dry run

[commit-bot: I haz the power, 2015-04-15 07:37:23]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1072973003/1

[commit-bot: I haz the power, 2015-04-15 07:41:07]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-04-15 07:41:09]

Presubmit check for 1072973003-1 failed and returned exit status 1.

Running presubmit commit checks ...
Checking out rietveld...
Running save-description-on-failure.sh
Running push-basic.sh
Running upstream.sh
Running submit-from-new-dir.sh
Running abandon.sh
Running submodule-merge-test.sh
Running upload-local-tracking-branch.sh
Running hooks.sh
Running post-dcommit-hook-test.sh
Running upload-stale.sh
Running patch.sh
Running basic.sh

** Presubmit ERRORS **
tests/gclient_smoketest.py (50.97s) failed
Ffatal: reference is not a tree: 9c69ce59b6e14ca7c898fd6242b53b8065e6a050
EE..............................................
======================================================================
ERROR: testBlinkDEPSChangeUsingGit (__main__.BlinkDEPSTransitionSmokeTest)
Like testBlinkDEPSChangeUsingGclient, but move the main project using
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/gclient_smoketest.py", line 1630, in testBlinkDEPSChangeUsingGit
    cwd=self.checkout_path)
  File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/subprocess2.py", line
484, in check_call
    check_call_out(args, **kwargs)
  File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/subprocess2.py", line
478, in check_call_out
    returncode, args, kwargs.get('cwd'), out[0], out[1])
CalledProcessError: Command git checkout -q
9c69ce59b6e14ca7c898fd6242b53b8065e6a050 returned non-zero exit status 128 in
/tmp/trialtizAVv/__main__.BlinkDEPSTransitionSmokeTest.testBlinkDEPSChangeUsingGit/src

======================================================================
ERROR: testBlinkLocalBranchesArePreserved
(__main__.BlinkDEPSTransitionSmokeTest)
Checks that the state of local git branches are effectively preserved
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/gclient_smoketest.py", line 1656, in
testBlinkLocalBranchesArePreserved
    self.CheckStatusPreMergePoint()
  File "tests/gclient_smoketest.py", line 1558, in CheckStatusPreMergePoint
    self.blink), self.blink_git_url)
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/scm.py", line
121, in Capture
    cwd=cwd, stderr=subprocess2.PIPE, env=env, **kwargs)
  File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/subprocess2.py", line
515, in check_output
    return check_call_out(args, stdout=PIPE, **kwargs)[0]
  File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/subprocess2.py", line
475, in check_call_out
    out, returncode = communicate(args, **kwargs)
  File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/subprocess2.py", line
449, in communicate
    proc = Popen(args, **kwargs)
  File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/subprocess2.py", line
253, in __init__
    % (str(e), kwargs.get('cwd'), args[0]))
OSError: Execution failed with error: [Errno 2] No such file or directory:
'/tmp/trialtizAVv/__main__.BlinkDEPSTransitionSmokeTest.testBlinkLocalBranchesArePreserved/src/third_party/WebKit'.
Check that
/tmp/trialtizAVv/__main__.BlinkDEPSTransitionSmokeTest.testBlinkLocalBranchesArePreserved/src/third_party/WebKit
or git exist and have execution permission.

======================================================================
FAIL: testBlinkDEPSChangeUsingGclient (__main__.BlinkDEPSTransitionSmokeTest)
Checks that {src,blink} repos are consistent when syncing going back and
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/gclient_smoketest.py", line 1601, in
testBlinkDEPSChangeUsingGclient
    self.assertEqual(res[2], 0, 'DEPS change sync failed.')
AssertionError: DEPS change sync failed.

----------------------------------------------------------------------
Ran 49 tests in 50.772s

FAILED (failures=1, errors=2)


Presubmit checks took 217.7s to calculate.

[Jiang Jiang, 2015-04-15 07:45:43]

On 2015/04/15 07:41:09, I haz the power (commit-bot) wrote:
> Presubmit check for 1072973003-1 failed and returned exit status 1.
> 
> Running presubmit commit checks ...
> Checking out rietveld...
> Running save-description-on-failure.sh
> Running push-basic.sh
> Running upstream.sh
> Running submit-from-new-dir.sh
> Running abandon.sh
> Running submodule-merge-test.sh
> Running upload-local-tracking-branch.sh
> Running hooks.sh
> Running post-dcommit-hook-test.sh
> Running upload-stale.sh
> Running patch.sh
> Running basic.sh
> 
> ** Presubmit ERRORS **
> tests/gclient_smoketest.py (50.97s) failed
> Ffatal: reference is not a tree: 9c69ce59b6e14ca7c898fd6242b53b8065e6a050
> EE..............................................
> ======================================================================
> ERROR: testBlinkDEPSChangeUsingGit (__main__.BlinkDEPSTransitionSmokeTest)
> Like testBlinkDEPSChangeUsingGclient, but move the main project using
> ----------------------------------------------------------------------
> Traceback (most recent call last):
>   File "tests/gclient_smoketest.py", line 1630, in testBlinkDEPSChangeUsingGit
>     cwd=self.checkout_path)
>   File
> "/b/infra_internal/commit_queue/workdir/tools/depot_tools/subprocess2.py",
line
> 484, in check_call
>     check_call_out(args, **kwargs)
>   File
> "/b/infra_internal/commit_queue/workdir/tools/depot_tools/subprocess2.py",
line
> 478, in check_call_out
>     returncode, args, kwargs.get('cwd'), out[0], out[1])
> CalledProcessError: Command git checkout -q
> 9c69ce59b6e14ca7c898fd6242b53b8065e6a050 returned non-zero exit status 128 in
>
/tmp/trialtizAVv/__main__.BlinkDEPSTransitionSmokeTest.testBlinkDEPSChangeUsingGit/src
> 
> ======================================================================
> ERROR: testBlinkLocalBranchesArePreserved
> (__main__.BlinkDEPSTransitionSmokeTest)
> Checks that the state of local git branches are effectively preserved
> ----------------------------------------------------------------------
> Traceback (most recent call last):
>   File "tests/gclient_smoketest.py", line 1656, in
> testBlinkLocalBranchesArePreserved
>     self.CheckStatusPreMergePoint()
>   File "tests/gclient_smoketest.py", line 1558, in CheckStatusPreMergePoint
>     self.blink), self.blink_git_url)
>   File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/scm.py", line
> 121, in Capture
>     cwd=cwd, stderr=subprocess2.PIPE, env=env, **kwargs)
>   File
> "/b/infra_internal/commit_queue/workdir/tools/depot_tools/subprocess2.py",
line
> 515, in check_output
>     return check_call_out(args, stdout=PIPE, **kwargs)[0]
>   File
> "/b/infra_internal/commit_queue/workdir/tools/depot_tools/subprocess2.py",
line
> 475, in check_call_out
>     out, returncode = communicate(args, **kwargs)
>   File
> "/b/infra_internal/commit_queue/workdir/tools/depot_tools/subprocess2.py",
line
> 449, in communicate
>     proc = Popen(args, **kwargs)
>   File
> "/b/infra_internal/commit_queue/workdir/tools/depot_tools/subprocess2.py",
line
> 253, in __init__
>     % (str(e), kwargs.get('cwd'), args[0]))
> OSError: Execution failed with error: [Errno 2] No such file or directory:
>
'/tmp/trialtizAVv/__main__.BlinkDEPSTransitionSmokeTest.testBlinkLocalBranchesArePreserved/src/third_party/WebKit'.
> Check that
>
/tmp/trialtizAVv/__main__.BlinkDEPSTransitionSmokeTest.testBlinkLocalBranchesArePreserved/src/third_party/WebKit
> or git exist and have execution permission.
> 
> ======================================================================
> FAIL: testBlinkDEPSChangeUsingGclient (__main__.BlinkDEPSTransitionSmokeTest)
> Checks that {src,blink} repos are consistent when syncing going back and
> ----------------------------------------------------------------------
> Traceback (most recent call last):
>   File "tests/gclient_smoketest.py", line 1601, in
> testBlinkDEPSChangeUsingGclient
>     self.assertEqual(res[2], 0, 'DEPS change sync failed.')
> AssertionError: DEPS change sync failed.
> 
> ----------------------------------------------------------------------
> Ran 49 tests in 50.772s
> 
> FAILED (failures=1, errors=2)
> 
> 
> Presubmit checks took 217.7s to calculate.

iannucci, any idea why the presubmit failed?

[Jiang Jiang, 2015-04-16 07:07:02]

ping again.

[jochen (gone - plz use gerrit), 2015-04-17 09:29:08]

do the tests pass for you locally?

[Jiang Jiang, 2015-04-17 09:31:24]

On 2015/04/17 09:29:08, jochen wrote:
> do the tests pass for you locally?

It got stuck at:

Loaded authentication cookies from /Users/jjgod/.codereview_upload_cookies
Running presubmit commit checks ...

..forever, so I can't test it locally.

[jochen (gone - plz use gerrit), 2015-04-20 06:35:58]

The CQ bit was checked by jochen@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2015-04-20 06:36:06]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1072973003/1

[commit-bot: I haz the power, 2015-04-20 06:39:34]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-04-20 06:39:35]

Dry run: This issue passed the CQ dry run.

[jochen (gone - plz use gerrit), 2015-04-20 06:40:25]

The CQ bit was checked by jochen@chromium.org

[commit-bot: I haz the power, 2015-04-20 06:40:32]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1072973003/1

[commit-bot: I haz the power, 2015-04-20 06:43:54]

Committed patchset #1 (id:1) as
http://src.chromium.org/viewvc/chrome?view=rev&revision=294894