From f9b4ed978a24aa01cb4ed9f41507d035e14260a9 Mon Sep 17 00:00:00 2001
From: Yuexi Ma <yuexima@google.com>
Date: Fri, 20 Apr 2018 16:33:51 -0700
Subject: Use .runner_config instead of .config

CTS TF started to read subdir .config file converted from AT.xml in the new suite impl.
This conflicts with our runner config's file extension.

Test: run vts-selftest
Bug: 78287777
Change-Id: Id234dcb11ce31c92ab841081ca5d9ee6686bc2c2
Merged-In: Id234dcb11ce31c92ab841081ca5d9ee6686bc2c2
---
 hwbinder_throughput_test/passthrough/AndroidTest.xml                   | 2 +-
 .../passthrough/HwBinderPassthroughThroughputTest.config               | 3 ---
 .../passthrough/HwBinderPassthroughThroughputTest.runner_conf          | 3 +++
 3 files changed, 4 insertions(+), 4 deletions(-)
 delete mode 100644 hwbinder_throughput_test/passthrough/HwBinderPassthroughThroughputTest.config
 create mode 100644 hwbinder_throughput_test/passthrough/HwBinderPassthroughThroughputTest.runner_conf

(limited to 'hwbinder_throughput_test/passthrough')

diff --git a/hwbinder_throughput_test/passthrough/AndroidTest.xml b/hwbinder_throughput_test/passthrough/AndroidTest.xml
index bbaab79..8d606c5 100644
--- a/hwbinder_throughput_test/passthrough/AndroidTest.xml
+++ b/hwbinder_throughput_test/passthrough/AndroidTest.xml
@@ -27,7 +27,7 @@
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="HwBinderPassthroughThroughputTest" />
         <option name="test-case-path" value="vts/testcases/performance/hwbinder_throughput_test/HwBinderThroughputBenchmark" />
-        <option name="test-config-path" value="vts/testcases/performance/hwbinder_throughput_test/passthrough/HwBinderPassthroughThroughputTest.config" />
+        <option name="test-config-path" value="vts/testcases/performance/hwbinder_throughput_test/passthrough/HwBinderPassthroughThroughputTest.runner_conf" />
         <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/hwbinder_throughput_test/passthrough/HwBinderPassthroughThroughputTest.config b/hwbinder_throughput_test/passthrough/HwBinderPassthroughThroughputTest.config
deleted file mode 100644
index 54d9875..0000000
--- a/hwbinder_throughput_test/passthrough/HwBinderPassthroughThroughputTest.config
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "hidl_hal_mode": "PASSTHROUGH"
-}
diff --git a/hwbinder_throughput_test/passthrough/HwBinderPassthroughThroughputTest.runner_conf b/hwbinder_throughput_test/passthrough/HwBinderPassthroughThroughputTest.runner_conf
new file mode 100644
index 0000000..54d9875
--- /dev/null
+++ b/hwbinder_throughput_test/passthrough/HwBinderPassthroughThroughputTest.runner_conf
@@ -0,0 +1,3 @@
+{
+    "hidl_hal_mode": "PASSTHROUGH"
+}
-- 
cgit v1.2.3