Make get_label_info take into account the toolchain for target_gen_dir

Make get_label_info take into account the toolchain for target_gen_dir

Previously get_label_info(<label>, "target_gen_dir") discarded toolchain information for the <label> and used the current toolchain. This makes this query useless for anything but the current toolchain. The other label info categories included this properly.

The actual bugfix is passing label.GetToolchainLabel() for the "target_gen_dir" case in function_get_label_info. This is tested by the new test in function-get_label_info_unittest.cc which was missing a test for this case.

Adding the toolchain label required adding more variants of the directory getters in filesystem_utils which were already passed the point of reason in terms of number of variants taking and returning slightly different but related things.

So this does a refactoring of the directory getter functions there to rationalize them among 4 classes of functions which can return one of two things, and a helper class that generalizes the input with whatever information the caller has. The rest of the changes are updates to the callers for this new system. There are some additional cases added to filesystem_utils_unittest.cc to test more combinations.

BUG=632412
Committed: https://crrev.com/8d6e145e3c939895491b83219583dfef48a94fac
Cr-Commit-Position: refs/heads/master@{#409334}

[brettw, 2016-08-01 21:29:24]

.

[brettw, 2016-08-01 21:33:44]

Description was changed from

==========
Make get_label_info take into account the toolchain

BUG=632412
==========

to

==========
Make get_label_info take into account the toolchain for target_gen_dir

Previously get_label_info(<label>, "target_gen_dir") discarded toolchain
information for the <label> and used the current toolchain. This makes this
query useless for anything but the current toolchain. The other label info
categories included this properly.

Adding this required adding more variants of the getters in filesystem_utils
which was already passed the point of reason in terms of number of variants
taking and returning slightly different but related things.

So this does a refactoring of the directory getter functions there to
rationalize them among 4 classes of functions which can return one of two
things, and a helper class that generalizes the input with whatever information
the caller has. The rest of the changes are updates to the callers for this new
system.

BUG=632412
==========

[brettw, 2016-08-01 21:44:26]

Description was changed from

==========
Make get_label_info take into account the toolchain for target_gen_dir

Previously get_label_info(<label>, "target_gen_dir") discarded toolchain
information for the <label> and used the current toolchain. This makes this
query useless for anything but the current toolchain. The other label info
categories included this properly.

Adding this required adding more variants of the getters in filesystem_utils
which was already passed the point of reason in terms of number of variants
taking and returning slightly different but related things.

So this does a refactoring of the directory getter functions there to
rationalize them among 4 classes of functions which can return one of two
things, and a helper class that generalizes the input with whatever information
the caller has. The rest of the changes are updates to the callers for this new
system.

BUG=632412
==========

to

==========
Make get_label_info take into account the toolchain for target_gen_dir

Previously get_label_info(<label>, "target_gen_dir") discarded toolchain
information for the <label> and used the current toolchain. This makes this
query useless for anything but the current toolchain. The other label info
categories included this properly.

The actual bugfix is passing label.GetToolchainLabel() for the "target_gen_dir"
case in function_get_label_info. This is tested by the new test in
function-get_label_info_unittest.cc which was missing a test for this case.

Adding the toolchain label required adding more variants of the directory
getters in filesystem_utils which were already passed the point of reason in
terms of number of variants taking and returning slightly different but related
things.

So this does a refactoring of the directory getter functions there to
rationalize them among 4 classes of functions which can return one of two
things, and a helper class that generalizes the input with whatever information
the caller has. The rest of the changes are updates to the callers for this new
system.

BUG=632412
==========

[brettw, 2016-08-01 21:45:47]

Description was changed from

==========
Make get_label_info take into account the toolchain for target_gen_dir

Previously get_label_info(<label>, "target_gen_dir") discarded toolchain
information for the <label> and used the current toolchain. This makes this
query useless for anything but the current toolchain. The other label info
categories included this properly.

The actual bugfix is passing label.GetToolchainLabel() for the "target_gen_dir"
case in function_get_label_info. This is tested by the new test in
function-get_label_info_unittest.cc which was missing a test for this case.

Adding the toolchain label required adding more variants of the directory
getters in filesystem_utils which were already passed the point of reason in
terms of number of variants taking and returning slightly different but related
things.

So this does a refactoring of the directory getter functions there to
rationalize them among 4 classes of functions which can return one of two
things, and a helper class that generalizes the input with whatever information
the caller has. The rest of the changes are updates to the callers for this new
system.

BUG=632412
==========

to

==========
Make get_label_info take into account the toolchain for target_gen_dir

Previously get_label_info(<label>, "target_gen_dir") discarded toolchain
information for the <label> and used the current toolchain. This makes this
query useless for anything but the current toolchain. The other label info
categories included this properly.

The actual bugfix is passing label.GetToolchainLabel() for the "target_gen_dir"
case in function_get_label_info. This is tested by the new test in
function-get_label_info_unittest.cc which was missing a test for this case.

Adding the toolchain label required adding more variants of the directory
getters in filesystem_utils which were already passed the point of reason in
terms of number of variants taking and returning slightly different but related
things.

So this does a refactoring of the directory getter functions there to
rationalize them among 4 classes of functions which can return one of two
things, and a helper class that generalizes the input with whatever information
the caller has. The rest of the changes are updates to the callers for this new
system. There are some additional cases added to filesystem_utils_unittest.cc to
test more combinations.

BUG=632412
==========

[brettw, 2016-08-01 21:50:55]

.

[brettw, 2016-08-01 21:50:56]

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

[commit-bot: I haz the power, 2016-08-01 21:51:19]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[brettw, 2016-08-01 21:53:54]

brettw@chromium.org changed reviewers:
+ sdefresne@chromium.org

[brettw, 2016-08-01 21:53:55]

Instructions for review: check function_get_label_info and corresponding test
file.

Then filesystem_utils.h for the directory computation API refactor. Then .cc and
unittest files (should be easy)

Everything else is a mechanical update to use the cleaned-up API.

https://codereview.chromium.org/2198433004/diff/40001/tools/gn/filesystem_uti...
File tools/gn/filesystem_utils.cc (right):

https://codereview.chromium.org/2198433004/diff/40001/tools/gn/filesystem_uti...
tools/gn/filesystem_utils.cc:166: // Helper function for computing
subdirectories in the build directory
This just moved from below.

https://codereview.chromium.org/2198433004/diff/40001/tools/gn/function_get_l...
File tools/gn/function_get_label_info.cc (right):

https://codereview.chromium.org/2198433004/diff/40001/tools/gn/function_get_l...
tools/gn/function_get_label_info.cc:121: BuildDirContext(scope,
label.GetToolchainLabel()),
This is the actual bugfix.

https://codereview.chromium.org/2198433004/diff/40001/tools/gn/function_get_l...
File tools/gn/function_get_label_info_unittest.cc (left):

https://codereview.chromium.org/2198433004/diff/40001/tools/gn/function_get_l...
tools/gn/function_get_label_info_unittest.cc:76: EXPECT_EQ("//out/Debug",
Call(":name", "root_out_dir"));
I don't know why this was here, the same thing is tested above.

https://codereview.chromium.org/2198433004/diff/40001/tools/gn/function_get_l...
File tools/gn/function_get_label_info_unittest.cc (right):

https://codereview.chromium.org/2198433004/diff/40001/tools/gn/function_get_l...
tools/gn/function_get_label_info_unittest.cc:87:
Call("//foo:name(//toolchain:random)", "target_gen_dir"));
This is the test for the actual bug.

[commit-bot: I haz the power, 2016-08-01 22:02:15]

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

[commit-bot: I haz the power, 2016-08-01 22:02:16]

Dry run: Try jobs failed on following builders:
  mac_chromium_compile_dbg_ng on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_comp...)

[brettw, 2016-08-02 16:41:31]

Remove unused static function

[brettw, 2016-08-02 16:41:32]

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

[commit-bot: I haz the power, 2016-08-02 16:42:14]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-08-02 17:28:22]

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

[commit-bot: I haz the power, 2016-08-02 17:28:23]

Dry run: This issue passed the CQ dry run.

[sdefresne, 2016-08-02 20:30:56]

lgtm

[brettw, 2016-08-02 21:33:55]

The CQ bit was checked by brettw@chromium.org

[commit-bot: I haz the power, 2016-08-02 21:34:48]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-08-02 21:40:37]

Description was changed from

==========
Make get_label_info take into account the toolchain for target_gen_dir

Previously get_label_info(<label>, "target_gen_dir") discarded toolchain
information for the <label> and used the current toolchain. This makes this
query useless for anything but the current toolchain. The other label info
categories included this properly.

The actual bugfix is passing label.GetToolchainLabel() for the "target_gen_dir"
case in function_get_label_info. This is tested by the new test in
function-get_label_info_unittest.cc which was missing a test for this case.

Adding the toolchain label required adding more variants of the directory
getters in filesystem_utils which were already passed the point of reason in
terms of number of variants taking and returning slightly different but related
things.

So this does a refactoring of the directory getter functions there to
rationalize them among 4 classes of functions which can return one of two
things, and a helper class that generalizes the input with whatever information
the caller has. The rest of the changes are updates to the callers for this new
system. There are some additional cases added to filesystem_utils_unittest.cc to
test more combinations.

BUG=632412
==========

to

==========
Make get_label_info take into account the toolchain for target_gen_dir

Previously get_label_info(<label>, "target_gen_dir") discarded toolchain
information for the <label> and used the current toolchain. This makes this
query useless for anything but the current toolchain. The other label info
categories included this properly.

The actual bugfix is passing label.GetToolchainLabel() for the "target_gen_dir"
case in function_get_label_info. This is tested by the new test in
function-get_label_info_unittest.cc which was missing a test for this case.

Adding the toolchain label required adding more variants of the directory
getters in filesystem_utils which were already passed the point of reason in
terms of number of variants taking and returning slightly different but related
things.

So this does a refactoring of the directory getter functions there to
rationalize them among 4 classes of functions which can return one of two
things, and a helper class that generalizes the input with whatever information
the caller has. The rest of the changes are updates to the callers for this new
system. There are some additional cases added to filesystem_utils_unittest.cc to
test more combinations.

BUG=632412
==========

[commit-bot: I haz the power, 2016-08-02 21:40:38]

Committed patchset #4 (id:60001)

[commit-bot: I haz the power, 2016-08-02 21:43:40]

Description was changed from

==========
Make get_label_info take into account the toolchain for target_gen_dir

Previously get_label_info(<label>, "target_gen_dir") discarded toolchain
information for the <label> and used the current toolchain. This makes this
query useless for anything but the current toolchain. The other label info
categories included this properly.

The actual bugfix is passing label.GetToolchainLabel() for the "target_gen_dir"
case in function_get_label_info. This is tested by the new test in
function-get_label_info_unittest.cc which was missing a test for this case.

Adding the toolchain label required adding more variants of the directory
getters in filesystem_utils which were already passed the point of reason in
terms of number of variants taking and returning slightly different but related
things.

So this does a refactoring of the directory getter functions there to
rationalize them among 4 classes of functions which can return one of two
things, and a helper class that generalizes the input with whatever information
the caller has. The rest of the changes are updates to the callers for this new
system. There are some additional cases added to filesystem_utils_unittest.cc to
test more combinations.

BUG=632412
==========

to

==========
Make get_label_info take into account the toolchain for target_gen_dir

Previously get_label_info(<label>, "target_gen_dir") discarded toolchain
information for the <label> and used the current toolchain. This makes this
query useless for anything but the current toolchain. The other label info
categories included this properly.

The actual bugfix is passing label.GetToolchainLabel() for the "target_gen_dir"
case in function_get_label_info. This is tested by the new test in
function-get_label_info_unittest.cc which was missing a test for this case.

Adding the toolchain label required adding more variants of the directory
getters in filesystem_utils which were already passed the point of reason in
terms of number of variants taking and returning slightly different but related
things.

So this does a refactoring of the directory getter functions there to
rationalize them among 4 classes of functions which can return one of two
things, and a helper class that generalizes the input with whatever information
the caller has. The rest of the changes are updates to the callers for this new
system. There are some additional cases added to filesystem_utils_unittest.cc to
test more combinations.

BUG=632412

Committed: https://crrev.com/8d6e145e3c939895491b83219583dfef48a94fac
Cr-Commit-Position: refs/heads/master@{#409334}
==========

[commit-bot: I haz the power, 2016-08-02 21:43:41]

Patchset 4 (id:??) landed as
https://crrev.com/8d6e145e3c939895491b83219583dfef48a94fac
Cr-Commit-Position: refs/heads/master@{#409334}