diff options
| author | Steven Moreland <smoreland@google.com> | 2024-01-29 21:22:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-01-29 21:22:00 +0000 |
| commit | 7b944b6220ec90cddcdfe1aa70dd93d27732f1f8 (patch) | |
| tree | 83ae2c0c93546192a1eab9559ea89dd31be485b1 | |
| parent | 9ea49efa299802256a9b138dcc40c96493130beb (diff) | |
| parent | c1e550d515748ee0a7ecfe3450c973a471c9d849 (diff) | |
| download | build-android14-tests-dev.tar.gz | |
Merge "Support test runnner option in auto generated test configs" into android14-tests-devandroid14-tests-dev
| -rw-r--r-- | core/instrumentation_test_config_template.xml | 4 | ||||
| -rw-r--r-- | core/java_host_test_config_template.xml | 4 | ||||
| -rw-r--r-- | core/native_test_config_template.xml | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/core/instrumentation_test_config_template.xml b/core/instrumentation_test_config_template.xml index 6ca964e414..379126c6de 100644 --- a/core/instrumentation_test_config_template.xml +++ b/core/instrumentation_test_config_template.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2017 The Android Open Source Project +<!-- Copyright (C) 2023 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -24,7 +24,7 @@ </target_preparer> <test class="com.android.tradefed.testtype.{TEST_TYPE}" > - <option name="package" value="{PACKAGE}" /> + {EXTRA_TEST_RUNNER_CONFIGS}<option name="package" value="{PACKAGE}" /> <option name="runner" value="{RUNNER}" /> </test> </configuration> diff --git a/core/java_host_test_config_template.xml b/core/java_host_test_config_template.xml index 26c1cafa32..e123dc7ed1 100644 --- a/core/java_host_test_config_template.xml +++ b/core/java_host_test_config_template.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2018 The Android Open Source Project +<!-- Copyright (C) 2023 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,6 +21,6 @@ {EXTRA_CONFIGS} <test class="com.android.tradefed.testtype.HostTest" > - <option name="jar" value="{MODULE}.jar" /> + {EXTRA_TEST_RUNNER_CONFIGS}<option name="jar" value="{MODULE}.jar" /> </test> </configuration> diff --git a/core/native_test_config_template.xml b/core/native_test_config_template.xml index ea982cf2f9..788157c611 100644 --- a/core/native_test_config_template.xml +++ b/core/native_test_config_template.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2017 The Android Open Source Project +<!-- Copyright (C) 2023 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -26,7 +26,7 @@ </target_preparer> <test class="com.android.tradefed.testtype.GTest" > - <option name="native-test-device-path" value="{TEST_INSTALL_BASE}" /> + {EXTRA_TEST_RUNNER_CONFIGS}<option name="native-test-device-path" value="{TEST_INSTALL_BASE}" /> <option name="module-name" value="{MODULE}" /> </test> </configuration> |