diff options
| author | Julien Desprez <jdesprez@google.com> | 2023-12-06 22:08:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-06 22:08:02 +0000 |
| commit | d7d8e9bd8a8a9fa99793c3faea129ff014f31d2b (patch) | |
| tree | 86e827ba8beb3d37b8bfe650c0c2e227b91576eb | |
| parent | d3320c93378bfcb3cccbd276611833c6e4d55c26 (diff) | |
| parent | fbdad8c72df50ab8a6f8a27ba3e567778521ea41 (diff) | |
| download | suite_harness-d7d8e9bd8a8a9fa99793c3faea129ff014f31d2b.tar.gz | |
Avoid optionsetter when creating suite object am: 846beac95e am: 8e4cc5307c am: fbdad8c72d
Original change: https://android-review.googlesource.com/c/platform/test/suite_harness/+/2862695
Change-Id: I92e729c8a7a63258656ab722d3a7feefc50444fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/suite/CompatibilityTestSuite.java | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/suite/CompatibilityTestSuite.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/suite/CompatibilityTestSuite.java index 9c15d35b..27120808 100644 --- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/suite/CompatibilityTestSuite.java +++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/suite/CompatibilityTestSuite.java @@ -21,12 +21,10 @@ import com.android.compatibility.common.tradefed.testtype.SubPlan; import com.android.compatibility.common.tradefed.testtype.retry.RetryFactoryTest; import com.android.ddmlib.Log.LogLevel; import com.android.tradefed.build.IBuildInfo; -import com.android.tradefed.config.ConfigurationException; import com.android.tradefed.config.IConfiguration; import com.android.tradefed.config.Option; import com.android.tradefed.config.Option.Importance; import com.android.tradefed.config.OptionClass; -import com.android.tradefed.config.OptionSetter; import com.android.tradefed.log.LogUtil.CLog; import com.android.tradefed.testtype.IAbi; import com.android.tradefed.testtype.suite.BaseTestSuite; @@ -68,13 +66,7 @@ public final class CompatibilityTestSuite extends BaseTestSuite { * Ctor that sets some default for Compatibility runs. */ public CompatibilityTestSuite() { - try { - OptionSetter setter = new OptionSetter(this); - setter.setOptionValue("skip-loading-config-jar", "true"); - } catch (ConfigurationException e) { - // Should not happen - throw new RuntimeException(e); - } + setSkipjarLoading(true); } @Override |