diff options
| author |  Klaus Aehlig <aehlig@google.com> | 2016-09-29 08:58:38 +0000 |
|---|---|---|
| committer |  Yun Peng <pcloudy@google.com> | 2016-09-29 09:13:14 +0000 |
| commit | 6aaedbc031d6dad1a5d917f2324d6fb65e32a60a (patch) | |
| tree | 8ec60045d48b6e017d9f8e00b6b255002de7d3e6 /src/test | |
| parent | 60b15f92e77a7873ad9f72964b4d19dc9d3c2f78 (diff) | |
Make action_env_test parametric in the product name
--
MOS_MIGRATED_REVID=134636896
Diffstat (limited to 'src/test')
| -rwxr-xr-x | src/test/shell/integration/action_env_test.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/test/shell/integration/action_env_test.sh b/src/test/shell/integration/action_env_test.sh index 80976ed34b..44fb1fd14c 100755 --- a/src/test/shell/integration/action_env_test.sh +++ b/src/test/shell/integration/action_env_test.sh @@ -47,7 +47,7 @@ function test_simple() { export FOO=baz bazel build --action_env=FOO=bar pkg:showenv \ || fail "bazel build showenv failed" - cat `bazel info bazel-genfiles`/pkg/env.txt > $TEST_log + cat `bazel info ${PRODUCT_NAME}-genfiles`/pkg/env.txt > $TEST_log expect_log "FOO=bar" } @@ -57,7 +57,7 @@ function test_simple_latest_wins() { bazel build --action_env=FOO=foo \ --action_env=BAR=willbeoverridden --action_env=BAR=bar pkg:showenv \ || fail "bazel build showenv failed" - cat `bazel info bazel-genfiles`/pkg/env.txt > $TEST_log + cat `bazel info ${PRODUCT_NAME}-genfiles`/pkg/env.txt > $TEST_log expect_log "FOO=foo" expect_log "BAR=bar" } @@ -68,7 +68,7 @@ function test_client_env() { bazel help build > /dev/null || fail "bazel help failed" export FOO=client_foo bazel build --action_env=FOO pkg:showenv || fail "bazel build showenv failed" - cat `bazel info bazel-genfiles`/pkg/env.txt > $TEST_log + cat `bazel info ${PRODUCT_NAME}-genfiles`/pkg/env.txt > $TEST_log expect_log "FOO=client_foo" } @@ -76,7 +76,7 @@ function test_redo_action() { export FOO=initial_foo export UNRELATED=some_value bazel build --action_env=FOO pkg:showenv || fail "bazel build showenv failed" - cat `bazel info bazel-genfiles`/pkg/env.txt > $TEST_log + cat `bazel info ${PRODUCT_NAME}-genfiles`/pkg/env.txt > $TEST_log expect_log "FOO=initial_foo" # If an unrelated value changes, we expect the action not to be executed again @@ -90,7 +90,7 @@ function test_redo_action() { bazel build --action_env=FOO -s --experimental_ui pkg:showenv 2> $TEST_log \ || fail "bazel build showenv failed" expect_log '^SUBCOMMAND.*pkg:showenv' - cat `bazel info bazel-genfiles`/pkg/env.txt > $TEST_log + cat `bazel info ${PRODUCT_NAME}-genfiles`/pkg/env.txt > $TEST_log expect_log "FOO=changed_foo" # But repeating the build with no further changes, no action should happen @@ -104,7 +104,7 @@ function test_latest_wins_arg() { export BAR=baz bazel build --action_env=BAR --action_env=FOO --action_env=FOO=foo \ pkg:showenv || fail "bazel build showenv failed" - cat `bazel info bazel-genfiles`/pkg/env.txt > $TEST_log + cat `bazel info ${PRODUCT_NAME}-genfiles`/pkg/env.txt > $TEST_log expect_log "FOO=foo" expect_log "BAR=baz" expect_not_log "FOO=bar" @@ -115,7 +115,7 @@ function test_latest_wins_env() { export BAR=baz bazel build --action_env=BAR --action_env=FOO=foo --action_env=FOO \ pkg:showenv || fail "bazel build showenv failed" - cat `bazel info bazel-genfiles`/pkg/env.txt > $TEST_log + cat `bazel info ${PRODUCT_NAME}-genfiles`/pkg/env.txt > $TEST_log expect_log "FOO=bar" expect_log "BAR=baz" expect_not_log "FOO=foo" |