diff options
author | Eric Lin <ericth@google.com> | 2021-12-07 06:23:21 +0000 |
---|---|---|
committer | Eric Lin <ericth@google.com> | 2021-12-07 16:33:43 +0000 |
commit | 0e51428a0a0d0c47ff0eff1c584faa91bb58ab51 (patch) | |
tree | a1d8fded501772159464b2750b30281e32f3bfc3 | |
parent | d2c2aeef3bb56c1ef604b4b88aebcc17d0733476 (diff) | |
download | platform_testing-0e51428a0a0d0c47ff0eff1c584faa91bb58ab51.tar.gz |
Rename the config file to avoid naming conflicts.
When running `atest mobly-hello-world-test` would read the wrong
config.xml from mobly-multidevice-test. Rename the config file
to avoid naming conflicts.
Bug: 209533317
Test: atest -v mobly-hello-world-test
Change-Id: I9e1f994fae0edf4f5edd73a6d3605a2b13aaa2a5
-rw-r--r-- | tests/example/mobly/Android.bp | 2 | ||||
-rw-r--r-- | tests/example/mobly/AndroidTest.xml | 2 | ||||
-rw-r--r-- | tests/example/mobly/mobly-hello-world-test_config.yaml (renamed from tests/example/mobly/config.yaml) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/tests/example/mobly/Android.bp b/tests/example/mobly/Android.bp index a38a4601f..b9623726e 100644 --- a/tests/example/mobly/Android.bp +++ b/tests/example/mobly/Android.bp @@ -24,5 +24,5 @@ python_test_host { test_options: { unit_test: false, }, - data: ["config.yaml"], + data: ["mobly-hello-world-test_config.yaml"], } diff --git a/tests/example/mobly/AndroidTest.xml b/tests/example/mobly/AndroidTest.xml index b455cfde1..c005741a8 100644 --- a/tests/example/mobly/AndroidTest.xml +++ b/tests/example/mobly/AndroidTest.xml @@ -20,7 +20,7 @@ </target_preparer> <test class="com.android.tradefed.testtype.mobly.MoblyBinaryHostTest"> <option name="mobly-par-file-name" value="mobly-hello-world-test" /> - <option name="mobly-config-file-name" value="config.yaml" /> + <option name="mobly-config-file-name" value="mobly-hello-world-test_config.yaml" /> <option name="mobly-test-timeout" value="1800000" /> </test> </configuration> diff --git a/tests/example/mobly/config.yaml b/tests/example/mobly/mobly-hello-world-test_config.yaml index daf65770d..daf65770d 100644 --- a/tests/example/mobly/config.yaml +++ b/tests/example/mobly/mobly-hello-world-test_config.yaml |