| commit | 07d15dcbabe631d5829b0ea5b60bbac31ade0cef | [log] [tgz] |
|---|---|---|
| author | Simran Basi <sbasi@google.com> | Fri Sep 08 14:44:09 2017 -0700 |
| committer | Simran Basi <sbasi@google.com> | Fri Sep 08 21:54:07 2017 +0000 |
| tree | e16959092a7a4773a6b433d562ce75d013c8083e | |
| parent | 23b4e4aa8d13aa87b0d81eed6e1a8f6c2e3011b9 [diff] |
Update DynamicConfigPusher to find files using CompatibilityBuildHelper * The dynamic config may be in the general test case folder so we need to use the CompatibilityBuildHelper to find it. Bug: 65490501 Test: tradefed.sh run template/local_min --template:map test=PtsWifiTestCases Change-Id: I455da2909d0fc011de9eef1ba5c42724adc30fda
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/DynamicConfigPusher.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/DynamicConfigPusher.java index d64c210..2d0e361 100644 --- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/DynamicConfigPusher.java +++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/DynamicConfigPusher.java
@@ -86,7 +86,7 @@ File localConfigFile = null; try { - localConfigFile = DynamicConfig.getConfigFile(buildHelper.getTestsDir(), mModuleName); + localConfigFile = buildHelper.getTestFile(mModuleName + ".dynamic"); } catch (FileNotFoundException e) { throw new TargetSetupError("Cannot get local dynamic config file from test directory", e, device.getDeviceDescriptor());