From 027a5424859847ae849723812b726eca1d850ef9 Mon Sep 17 00:00:00 2001 From: Robert Iannucci Date: Thu, 8 Jun 2017 12:29:39 -0700 Subject: [PATCH] [infra_paths] remove unused goma_deps_cache. R=dnj@chromium.org Bug: Change-Id: I69d2e75a7a6784a611f6e0128f1ba5617f009af2 Reviewed-on: https://chromium-review.googlesource.com/528320 Reviewed-by: Daniel Jacques Commit-Queue: Robbie Iannucci --- .../examples/full.expected/paths_kitchen_linux.json | 2 +- .../examples/full.expected/paths_kitchen_mac.json | 2 +- .../examples/full.expected/paths_kitchen_win.json | 2 +- recipes/recipe_modules/infra_paths/path_config.py | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/recipes/recipe_modules/infra_paths/examples/full.expected/paths_kitchen_linux.json b/recipes/recipe_modules/infra_paths/examples/full.expected/paths_kitchen_linux.json index 108b0eacb6..8401461e7b 100644 --- a/recipes/recipe_modules/infra_paths/examples/full.expected/paths_kitchen_linux.json +++ b/recipes/recipe_modules/infra_paths/examples/full.expected/paths_kitchen_linux.json @@ -3,7 +3,7 @@ "cmd": [], "name": "show cache path", "~followup_annotations": [ - "@@@STEP_LOG_LINE@result@base_paths: {'builder_cache': ('/', 'b', 'c', 'b'), 'goma_deps_cache': ('/', 'b', 'c', 'goma_deps_cache'), 'cache': ('/', 'b', 'c'), 'goma_cache': ('/', 'b', 'c', 'goma_cache'), 'start_dir': ('/', 'b', 'FakeTestingCWD'), 'git_cache': ('/', 'b', 'c', 'git_cache'), 'root': ('/', 'b', 'FakeTestingCWD'), 'tmp_base': ('/',)}@@@", + "@@@STEP_LOG_LINE@result@base_paths: {'builder_cache': ('/', 'b', 'c', 'b'), 'cache': ('/', 'b', 'c'), 'goma_cache': ('/', 'b', 'c', 'goma_cache'), 'start_dir': ('/', 'b', 'FakeTestingCWD'), 'git_cache': ('/', 'b', 'c', 'git_cache'), 'root': ('/', 'b', 'FakeTestingCWD'), 'tmp_base': ('/',)}@@@", "@@@STEP_LOG_LINE@result@default_git_cache_dir: Path('git_cache')@@@", "@@@STEP_LOG_END@result@@@" ] diff --git a/recipes/recipe_modules/infra_paths/examples/full.expected/paths_kitchen_mac.json b/recipes/recipe_modules/infra_paths/examples/full.expected/paths_kitchen_mac.json index 108b0eacb6..8401461e7b 100644 --- a/recipes/recipe_modules/infra_paths/examples/full.expected/paths_kitchen_mac.json +++ b/recipes/recipe_modules/infra_paths/examples/full.expected/paths_kitchen_mac.json @@ -3,7 +3,7 @@ "cmd": [], "name": "show cache path", "~followup_annotations": [ - "@@@STEP_LOG_LINE@result@base_paths: {'builder_cache': ('/', 'b', 'c', 'b'), 'goma_deps_cache': ('/', 'b', 'c', 'goma_deps_cache'), 'cache': ('/', 'b', 'c'), 'goma_cache': ('/', 'b', 'c', 'goma_cache'), 'start_dir': ('/', 'b', 'FakeTestingCWD'), 'git_cache': ('/', 'b', 'c', 'git_cache'), 'root': ('/', 'b', 'FakeTestingCWD'), 'tmp_base': ('/',)}@@@", + "@@@STEP_LOG_LINE@result@base_paths: {'builder_cache': ('/', 'b', 'c', 'b'), 'cache': ('/', 'b', 'c'), 'goma_cache': ('/', 'b', 'c', 'goma_cache'), 'start_dir': ('/', 'b', 'FakeTestingCWD'), 'git_cache': ('/', 'b', 'c', 'git_cache'), 'root': ('/', 'b', 'FakeTestingCWD'), 'tmp_base': ('/',)}@@@", "@@@STEP_LOG_LINE@result@default_git_cache_dir: Path('git_cache')@@@", "@@@STEP_LOG_END@result@@@" ] diff --git a/recipes/recipe_modules/infra_paths/examples/full.expected/paths_kitchen_win.json b/recipes/recipe_modules/infra_paths/examples/full.expected/paths_kitchen_win.json index 108b0eacb6..8401461e7b 100644 --- a/recipes/recipe_modules/infra_paths/examples/full.expected/paths_kitchen_win.json +++ b/recipes/recipe_modules/infra_paths/examples/full.expected/paths_kitchen_win.json @@ -3,7 +3,7 @@ "cmd": [], "name": "show cache path", "~followup_annotations": [ - "@@@STEP_LOG_LINE@result@base_paths: {'builder_cache': ('/', 'b', 'c', 'b'), 'goma_deps_cache': ('/', 'b', 'c', 'goma_deps_cache'), 'cache': ('/', 'b', 'c'), 'goma_cache': ('/', 'b', 'c', 'goma_cache'), 'start_dir': ('/', 'b', 'FakeTestingCWD'), 'git_cache': ('/', 'b', 'c', 'git_cache'), 'root': ('/', 'b', 'FakeTestingCWD'), 'tmp_base': ('/',)}@@@", + "@@@STEP_LOG_LINE@result@base_paths: {'builder_cache': ('/', 'b', 'c', 'b'), 'cache': ('/', 'b', 'c'), 'goma_cache': ('/', 'b', 'c', 'goma_cache'), 'start_dir': ('/', 'b', 'FakeTestingCWD'), 'git_cache': ('/', 'b', 'c', 'git_cache'), 'root': ('/', 'b', 'FakeTestingCWD'), 'tmp_base': ('/',)}@@@", "@@@STEP_LOG_LINE@result@default_git_cache_dir: Path('git_cache')@@@", "@@@STEP_LOG_END@result@@@" ] diff --git a/recipes/recipe_modules/infra_paths/path_config.py b/recipes/recipe_modules/infra_paths/path_config.py index e63783a2e7..1036d51656 100644 --- a/recipes/recipe_modules/infra_paths/path_config.py +++ b/recipes/recipe_modules/infra_paths/path_config.py @@ -36,18 +36,18 @@ def infra_kitchen(c): if c.PLATFORM in ('linux', 'mac'): c.base_paths['cache'] = ('/', 'b', 'c') c.base_paths['builder_cache'] = c.base_paths['cache'] + ('b',) - for path in ('git_cache', 'goma_cache', 'goma_deps_cache'): + for path in ('git_cache', 'goma_cache'): c.base_paths[path] = c.base_paths['cache'] + (path,) elif b_dir: c.base_paths['cache'] = b_dir + ('c',) c.base_paths['builder_cache'] = c.base_paths['cache'] + ('b',) - for path in ('git_cache', 'goma_cache', 'goma_deps_cache'): + for path in ('git_cache', 'goma_cache'): c.base_paths[path] = c.base_paths['cache'] + (path,) else: # pragma: no cover c.base_paths['cache'] = c.base_paths['root'] + ('c',) c.base_paths['builder_cache'] = c.base_paths['cache'] + ('b',) c.base_paths['git_cache'] = c.base_paths['root'] + ('cache_dir',) - for path in ('goma_cache', 'goma_deps_cache'): + for path in ('goma_cache',): c.base_paths[path] = c.base_paths['cache'] + (path,)