diff options
| author |  jingwen <jingwen@google.com> | 2018-01-29 10:18:50 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-01-29 10:20:38 -0800 |
| commit | 42d62185f6f22ee836a703f58a25f671c367c9ab (patch) | |
| tree | 38ff41b94fda795f0ab248714d25a19b5696a843 /src/main/java/com/google | |
| parent | 054f4ca7553a269b73caedda4154ac5f24f19c7e (diff) | |
Remove quotes from argv in android_instrumentation_test stub template and add the argv to the java args
RELNOTES: None.
PiperOrigin-RevId: 183685024
Diffstat (limited to 'src/main/java/com/google')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/android_instrumentation_test_template.txt | 27 |
1 files changed, 14 insertions, 13 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 b5aaf1d40e..afa8f65549 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 @@ -71,18 +71,18 @@ fixture_args="%fixture_args%" test_suite_property_name='%test_suite_property_name%' argv=$(cat <<END ---aapt="${aapt}" \ ---adb="${adb}" \ ---device_broker_type="${device_broker_type}" \ ---device_script="${device_script}" \ ---data_deps="${data_deps}" \ ---test_label="${test_label}" \ ---apks_to_install="${apks_to_install}" \ ---fixture_scripts="$(printf "%s," "${!device_script_fixtures[@]}")" \ ---hermetic_server_script="${host_service_fixture}" \ ---hermetic_servers="${host_service_fixture_services}" \ ---data_deps="$(printf "%s," "${!device_script_fixtures[@]}")" \ ---test_filter="${ANDROID_TESTBRIDGE_TEST_ONLY}" \ +--aapt=${aapt} \ +--adb=${adb} \ +--device_broker_type=${device_broker_type} \ +--device_script=${device_script} \ +--data_deps=${data_deps} \ +--test_label=${test_label} \ +--apks_to_install=${apks_to_install} \ +--fixture_scripts=$(printf "%s," "${!device_script_fixtures[@]}") \ +--hermetic_server_script=${host_service_fixture} \ +--hermetic_servers=${host_service_fixture_services} \ +--data_deps=$(printf "%s," "${!device_script_fixtures[@]}") \ +--test_filter=${ANDROID_TESTBRIDGE_TEST_ONLY} \ $@ END ) @@ -99,4 +99,5 @@ 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" + --wrapper_script_flag=--jvm_flag=-Dargv="$argv" \ + $argv |