diff options
| author |  jingwen <jingwen@google.com> | 2018-02-01 11:47:40 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-02-01 11:49:12 -0800 |
| commit | a48162b3bb1276ad2b92dde2c9913d1416d9d5c6 (patch) | |
| tree | 30e7500e34c864527ce5cf4c8cae850930ca60c9 /src/main/java/com/google/devtools/build/lib/rules | |
| parent | 34af6459d873dc066c5d90d9f8755a24eeec1827 (diff) | |
Remove setting of $DISPLAY variable by android_instrumentation_test.
This makes the android_instrumentation_test silent by default. If the
emulator GUI is required, the following flag is used:
`--action_env=DISPLAY=$DISPLAY # or whatever port the display is on`
RELNOTES: None.
PiperOrigin-RevId: 184172016
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/android_instrumentation_test_template.txt | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/android_instrumentation_test_template.txt b/src/main/java/com/google/devtools/build/lib/rules/android/android_instrumentation_test_template.txt index afa8f65549..5278009086 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/android_instrumentation_test_template.txt +++ b/src/main/java/com/google/devtools/build/lib/rules/android/android_instrumentation_test_template.txt @@ -87,16 +87,6 @@ $@ END ) -# Export the default DISPLAY variable to :0 if DISPLAY is not set, which is the -# case in sandboxing. This will allow Android emulators to show up by default. -# The DISPLAY variable can also be set with --action_env. -# e.g. `bazel test //... --action_env=DISPLAY=:42` -# To disable DISPLAY, set -# android_instrumentation_test.args = [ "--enable_display=false" ] -if [[ -z "${DISPLAY-}" ]]; then - export DISPLAY=:0 -fi - $test_entry_point \ --wrapper_script_flag=--jvm_flag=-D$test_suite_property_name=com.google.android.apps.common.testing.suite.AndroidDeviceTestSuite \ --wrapper_script_flag=--jvm_flag=-Dargv="$argv" \ |