Snap for 4386413 from 8ed9e53b17712a0ea66cc84583df1edd881d9616 to pi-release
Change-Id: I5c4d32943a18c454f161cc89e6e5da2eb656c6c5
diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml
index 9e30703..f861a10 100644
--- a/tests/AndroidTest.xml
+++ b/tests/AndroidTest.xml
@@ -17,10 +17,10 @@
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
<option name="push-group" value="HostDrivenTest.push" />
<option name="cleanup" value="true" />
- <option name="push" value="DATA/nativetest/android.hardware.tests.msgq@1.0-service-test/android.hardware.tests.msgq@1.0-service-test->/data/local/tmp/32/android.hardware.tests.msgq@1.0-service-test/android.hardware.tests.msgq@1.0-service-test" />
- <option name="push" value="DATA/nativetest64/android.hardware.tests.msgq@1.0-service-test/android.hardware.tests.msgq@1.0-service-test->/data/local/tmp/64/android.hardware.tests.msgq@1.0-service-test/android.hardware.tests.msgq@1.0-service-test" />
- <option name="push" value="DATA/nativetest/mq_test_client/mq_test_client->/data/local/tmp/32/mq_test_client/mq_test_client" />
- <option name="push" value="DATA/nativetest64/mq_test_client/mq_test_client->/data/local/tmp/64/mq_test_client/mq_test_client" />
+ <option name="push" value="DATA/nativetest/android.hardware.tests.msgq@1.0-service-test/android.hardware.tests.msgq@1.0-service-test->/data/nativetest/android.hardware.tests.msgq@1.0-service-test/android.hardware.tests.msgq@1.0-service-test" />
+ <option name="push" value="DATA/nativetest64/android.hardware.tests.msgq@1.0-service-test/android.hardware.tests.msgq@1.0-service-test->/data/nativetest64/android.hardware.tests.msgq@1.0-service-test/android.hardware.tests.msgq@1.0-service-test" />
+ <option name="push" value="DATA/nativetest/mq_test_client/mq_test_client->/data/nativetest/mq_test_client/mq_test_client" />
+ <option name="push" value="DATA/nativetest64/mq_test_client/mq_test_client->/data/nativetest64/mq_test_client/mq_test_client" />
<option name="push" value="DATA/nativetest64/hidl_test_helper->/data/nativetest64/hidl_test_helper" />
<option name="push" value="DATA/lib/android.hardware.tests.msgq@1.0.so->/data/local/tmp/system/lib/android.hardware.tests.msgq@1.0.so" />
<option name="push" value="DATA/lib64/android.hardware.tests.msgq@1.0.so->/data/local/tmp/system/lib64/android.hardware.tests.msgq@1.0.so" />
@@ -31,9 +31,10 @@
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
<option name="test-module-name" value="VtsFmqUnitTests" />
<option name="binary-test-type" value="binary_test" />
- <option name="binary-test-source" value="DATA/nativetest64/fmq_test->/data/local/tmp/64/fmq_test" />
+ <option name="binary-test-source" value="DATA/nativetest64/fmq_test->/data/nativetest64/fmq_test" />
<option name="binary-test-envp" value="VTS_ROOT_PATH=/data/local/tmp" />
- <option name="binary-test-args" value="-mVTS" />
+ <option name="binary-test-args" value="-x /data/local/tmp/system/lib" />
+ <option name="binary-test-args" value="-y /data/local/tmp/system/lib64" />
<option name="test-timeout" value="1m"/>
</test>
</configuration>
diff --git a/tests/fmq_test b/tests/fmq_test
index 9bd6464..02683c9 100644
--- a/tests/fmq_test
+++ b/tests/fmq_test
@@ -1,25 +1,9 @@
source /data/nativetest64/hidl_test_helper
-function run_fmq_test() {
- local RUN_MODE=$1
- if [ "${RUN_MODE}" == "-mVTS" ]; then
- TREBLE_TESTING_OVERRIDE=true run_all_tests \
- "/data/local/tmp/32/android.hardware.tests.msgq@1.0-service-test/android.hardware.tests.msgq@1.0-service-test" \
- "/data/local/tmp/64/android.hardware.tests.msgq@1.0-service-test/android.hardware.tests.msgq@1.0-service-test" \
- "/data/local/tmp/32/mq_test_client/mq_test_client" \
- "/data/local/tmp/64/mq_test_client/mq_test_client" \
- "fmq_test" \
- "-x/data/local/tmp/system/lib" \
- "-y/data/local/tmp/system/lib64"
- else
- TREBLE_TESTING_OVERRIDE=true run_all_tests \
- "/data/nativetest/android.hardware.tests.msgq@1.0-service-test/android.hardware.tests.msgq@1.0-service-test" \
- "/data/nativetest64/android.hardware.tests.msgq@1.0-service-test/android.hardware.tests.msgq@1.0-service-test" \
- "/data/nativetest/mq_test_client/mq_test_client" \
- "/data/nativetest64/mq_test_client/mq_test_client" \
- "fmq_test"
- fi
-}
-
-run_fmq_test $@
-
+TREBLE_TESTING_OVERRIDE=true run_all_tests \
+ "/data/nativetest/android.hardware.tests.msgq@1.0-service-test/android.hardware.tests.msgq@1.0-service-test" \
+ "/data/nativetest64/android.hardware.tests.msgq@1.0-service-test/android.hardware.tests.msgq@1.0-service-test" \
+ "/data/nativetest/mq_test_client/mq_test_client" \
+ "/data/nativetest64/mq_test_client/mq_test_client" \
+ "fmq_test" \
+ "$@"