diff options
| author | Zhuoyao Zhang <zhuoyao@google.com> | 2017-02-04 01:25:38 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-04 01:25:38 +0000 |
| commit | 535cbf591b9cec68c53205bf13b4f626def0f7c8 (patch) | |
| tree | cae3ef3ad7f8cabbe914b3831b9d61f1eabc26b1 | |
| parent | 14511626c42e641a3bc8ee30789cf78785f7aac5 (diff) | |
| parent | a3aac780ce29586c134dc1a8ed3341a4e62873a6 (diff) | |
| download | performance-535cbf591b9cec68c53205bf13b4f626def0f7c8.tar.gz | |
Fix FmqPerformanceTest. am: 496bbe1c20 am: 4efd712619
am: a3aac780ce
Change-Id: Icae3c94b0ac76cfdcff021a3cab6131a5d50d9b9
| -rw-r--r-- | fmq_benchmark/AndroidTest.xml | 9 | ||||
| -rw-r--r-- | fmq_benchmark/FmqPerformanceTest.py | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/fmq_benchmark/AndroidTest.xml b/fmq_benchmark/AndroidTest.xml index 28a7b79..6bd2ea4 100644 --- a/fmq_benchmark/AndroidTest.xml +++ b/fmq_benchmark/AndroidTest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2017 The Android Open Source Project +<!-- Copyright (C) 2016 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. @@ -17,11 +17,12 @@ <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/bin/mq_benchmark_service->/data/local/tmp/mq_benchmark_service" /> + <option name="push" value="DATA/bin/mq_benchmark_service32->/data/local/tmp/32/mq_benchmark_service32" /> + <option name="push" value="DATA/bin/mq_benchmark_service64->/data/local/tmp/64/mq_benchmark_service64" /> <option name="push" value="DATA/nativetest/mq_benchmark_client/mq_benchmark_client->/data/local/tmp/32/mq_benchmark_client32" /> <option name="push" value="DATA/nativetest64/mq_benchmark_client/mq_benchmark_client->/data/local/tmp/64/mq_benchmark_client64" /> - <option name="push" value="DATA/lib/android.hardware.tests.msgq@1.0.so->/data/local/tmp/32/android.hardware.tests.msgq@1.0.so" /> - <option name="push" value="DATA/lib64/android.hardware.tests.msgq@1.0.so->/data/local/tmp/64/android.hardware.tests.msgq@1.0.so" /> + <option name="push" value="DATA/lib/android.hardware.benchmarks.msgq@1.0.so->/data/local/tmp/32/android.hardware.benchmarks.msgq@1.0.so" /> + <option name="push" value="DATA/lib64/android.hardware.benchmarks.msgq@1.0.so->/data/local/tmp/64/android.hardware.benchmarks.msgq@1.0.so" /> </target_preparer> <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" /> <test class="com.android.tradefed.testtype.VtsMultiDeviceTest"> diff --git a/fmq_benchmark/FmqPerformanceTest.py b/fmq_benchmark/FmqPerformanceTest.py index cd84305..ea82766 100644 --- a/fmq_benchmark/FmqPerformanceTest.py +++ b/fmq_benchmark/FmqPerformanceTest.py @@ -82,7 +82,7 @@ class FmqPerformanceTest(base_test_with_webdb.BaseTestWithWebDbClass): """ # Start the benchmark service. logging.info("Start the benchmark service(%s bit mode)", bits) - binary = "/data/local/tmp/mq_benchmark_service" + binary = "/data/local/tmp/%s/mq_benchmark_service%s" % (bits, bits) results = self.dut.shell.one.Execute([ "chmod 755 %s" % binary, "LD_LIBRARY_PATH=/data/local/tmp/%s:" "$LD_LIBRARY_PATH %s&" % (bits, binary) |