Fix invocation flow assumption
CTS was assuming some order for "setBuild/Device" in
respect to invocationStart when there was none.
Bug: 31384680
Change-Id: Ic1a1f8a733181a1751b8a0c68d40ccb7f7fc0db3
diff --git a/tools/cts-tradefed/res/config/collect-tests-only.xml b/tools/cts-tradefed/res/config/collect-tests-only.xml
index 9ee7d51..1530d90 100644
--- a/tools/cts-tradefed/res/config/collect-tests-only.xml
+++ b/tools/cts-tradefed/res/config/collect-tests-only.xml
@@ -22,7 +22,7 @@
them as passed.
Obviously no one would modify the report before uploading to falsify this
information, as that would be dishonest, and dishonesty kills kittens :'( -->
- <option name="compatibility:plan" value="collect-tests-only" />
+ <option name="plan" value="collect-tests-only" />
<option name="skip-preconditions" value="true" />
<option name="skip-connectivity-check" value="true" />
diff --git a/tools/cts-tradefed/res/config/cts-automated.xml b/tools/cts-tradefed/res/config/cts-automated.xml
index a4da162..bedfb15 100644
--- a/tools/cts-tradefed/res/config/cts-automated.xml
+++ b/tools/cts-tradefed/res/config/cts-automated.xml
@@ -17,7 +17,7 @@
<include name="cts" />
- <option name="compatibility:plan" value="cts" />
+ <option name="plan" value="cts" />
<option name="skip-preconditions" value="false" />
<option name="skip-connectivity-check" value="false" />
diff --git a/tools/cts-tradefed/res/config/cts-camera.xml b/tools/cts-tradefed/res/config/cts-camera.xml
index 5bc395d..47377b4 100644
--- a/tools/cts-tradefed/res/config/cts-camera.xml
+++ b/tools/cts-tradefed/res/config/cts-camera.xml
@@ -17,7 +17,7 @@
<include name="cts" />
- <option name="compatibility:plan" value="cts-camera" />
+ <option name="plan" value="cts-camera" />
<!-- All camera CTS tests -->
<option name="compatibility:include-filter" value="CtsCameraTestCases" />
diff --git a/tools/cts-tradefed/res/config/cts-dev.xml b/tools/cts-tradefed/res/config/cts-dev.xml
index 0cf53ca..97c3cdd 100644
--- a/tools/cts-tradefed/res/config/cts-dev.xml
+++ b/tools/cts-tradefed/res/config/cts-dev.xml
@@ -21,7 +21,7 @@
<option name="skip-preconditions" value="true" />
<option name="skip-device-info" value="true" />
- <option name="compatibility:plan" value="cts-dev" />
+ <option name="plan" value="cts-dev" />
<option name="compatibility:skip-all-system-status-check" value="true" />
<option name="compatibility:primary-abi-only" value="true" />
diff --git a/tools/cts-tradefed/res/config/cts-filtered-sample.xml b/tools/cts-tradefed/res/config/cts-filtered-sample.xml
index 73b98c5..eb4c99a 100644
--- a/tools/cts-tradefed/res/config/cts-filtered-sample.xml
+++ b/tools/cts-tradefed/res/config/cts-filtered-sample.xml
@@ -17,7 +17,7 @@
<include name="common-compatibility-config" />
- <option name="compatibility:plan" value="cts-filtered-sample" />
+ <option name="plan" value="cts-filtered-sample" />
<!-- Tell all AndroidJUnitTests to only run the medium sized tests -->
<option name="compatibility:test-arg" value="com.android.tradefed.testtype.AndroidJUnitTest:size:medium" />
diff --git a/tools/cts-tradefed/res/config/cts-java.xml b/tools/cts-tradefed/res/config/cts-java.xml
index 52c25c9..722d8f7 100644
--- a/tools/cts-tradefed/res/config/cts-java.xml
+++ b/tools/cts-tradefed/res/config/cts-java.xml
@@ -17,7 +17,7 @@
<include name="cts" />
- <option name="compatibility:plan" value="cts-java" />
+ <option name="plan" value="cts-java" />
<!-- Include CtsLibcoreTestCases -->
<option name="compatibility:include-filter" value="CtsLibcoreTestCases" />
diff --git a/tools/cts-tradefed/res/config/cts-pdk.xml b/tools/cts-tradefed/res/config/cts-pdk.xml
index 32dcecc..81f97b0 100644
--- a/tools/cts-tradefed/res/config/cts-pdk.xml
+++ b/tools/cts-tradefed/res/config/cts-pdk.xml
@@ -17,7 +17,7 @@
<include name="cts" />
- <option name="compatibility:plan" value="cts-pdk" />
+ <option name="plan" value="cts-pdk" />
<!-- Include test modules -->
<option name="compatibility:include-filter" value="CtsAadbHostTestCases" />
diff --git a/tools/cts-tradefed/res/config/cts-preconditions.xml b/tools/cts-tradefed/res/config/cts-preconditions.xml
index 4121976..b6a33df 100644
--- a/tools/cts-tradefed/res/config/cts-preconditions.xml
+++ b/tools/cts-tradefed/res/config/cts-preconditions.xml
@@ -15,7 +15,7 @@
-->
<configuration description="CTS precondition configs">
- <option name="compatibility:plan" value="cts-preconditions" />
+ <option name="plan" value="cts-preconditions" />
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.DynamicConfigPusher">
<option name="target" value="host" />
diff --git a/tools/cts-tradefed/res/config/cts.xml b/tools/cts-tradefed/res/config/cts.xml
index 2eb0c3e..f3ce9f0 100644
--- a/tools/cts-tradefed/res/config/cts.xml
+++ b/tools/cts-tradefed/res/config/cts.xml
@@ -19,7 +19,7 @@
<include name="cts-preconditions" />
<include name="cts-known-failures" />
- <option name="compatibility:plan" value="cts" />
+ <option name="plan" value="cts" />
<option name="enable-root" value="false" />