diff options
| author | Julien Desprez <jdesprez@google.com> | 2021-10-04 09:11:06 -0700 |
|---|---|---|
| committer | Julien Desprez <jdesprez@google.com> | 2021-10-04 09:11:45 -0700 |
| commit | abde96491a52c4cbbd01622608345bb8c456b2bd (patch) | |
| tree | a3aa84102fa83a753a60cb9cfdbcd57a5cf2f7fb | |
| parent | 4226ddf7e1be6db45c090dc4cfd506c73c8f1d6d (diff) | |
| download | cts-abde96491a52c4cbbd01622608345bb8c456b2bd.tar.gz | |
Add a checker to help optimizing sharding
Test: presubmit
Bug: 201822981
Change-Id: I6e85936fa7eff419e86579e48bac231f26fa7cb2
| -rw-r--r-- | tools/cts-tradefed/tests/src/com/android/compatibility/common/tradefed/presubmit/CtsConfigLoadingTest.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/cts-tradefed/tests/src/com/android/compatibility/common/tradefed/presubmit/CtsConfigLoadingTest.java b/tools/cts-tradefed/tests/src/com/android/compatibility/common/tradefed/presubmit/CtsConfigLoadingTest.java index 7946a215e4e..8e2eba257da 100644 --- a/tools/cts-tradefed/tests/src/com/android/compatibility/common/tradefed/presubmit/CtsConfigLoadingTest.java +++ b/tools/cts-tradefed/tests/src/com/android/compatibility/common/tradefed/presubmit/CtsConfigLoadingTest.java @@ -33,6 +33,7 @@ import com.android.tradefed.invoker.shard.token.TokenProperty; import com.android.tradefed.targetprep.DeviceSetup; import com.android.tradefed.targetprep.ITargetPreparer; import com.android.tradefed.testtype.AndroidJUnitTest; +import com.android.tradefed.testtype.GTest; import com.android.tradefed.testtype.HostTest; import com.android.tradefed.testtype.IRemoteTest; import com.android.tradefed.testtype.ITestFilterReceiver; @@ -262,6 +263,13 @@ public class CtsConfigLoadingTest { config.getName(), test)); } } + if (test instanceof GTest) { + if (((GTest) test).isRebootBeforeTestEnabled()) { + throw new ConfigurationException(String.format( + "%s: instead of reboot-before-test use a RebootTargetPreparer " + + "which is more optimized during sharding.", config.getName())); + } + } // Tests are expected to implement that interface. if (!(test instanceof ITestFilterReceiver)) { throw new IllegalArgumentException(String.format( |