Generate XML for all ABIs
Change-Id: I59ecfdbf56bfde4a6e54f80130318bfa930c1beb
diff --git a/build/test_executable.mk b/build/test_executable.mk
index 1439663..5cccd1c 100644
--- a/build/test_executable.mk
+++ b/build/test_executable.mk
@@ -41,5 +41,4 @@
-p $(PRIVATE_TEST_PACKAGE) \
-e $(CTS_EXPECTATIONS) \
-b $(CTS_UNSUPPORTED_ABIS) \
- -a $(TARGET_ARCH) \
-o $@
diff --git a/build/test_gtest_package.mk b/build/test_gtest_package.mk
index eeb8bbe..c3471ed 100644
--- a/build/test_gtest_package.mk
+++ b/build/test_gtest_package.mk
@@ -50,5 +50,4 @@
-p $(PRIVATE_TEST_PACKAGE) \
-e $(CTS_EXPECTATIONS) \
-b $(CTS_UNSUPPORTED_ABIS) \
- -a $(TARGET_ARCH) \
-o $@
diff --git a/build/test_host_java_library.mk b/build/test_host_java_library.mk
index c502b83..cb44010 100644
--- a/build/test_host_java_library.mk
+++ b/build/test_host_java_library.mk
@@ -36,5 +36,4 @@
-p $(PRIVATE_TEST_PACKAGE) \
-e $(CTS_EXPECTATIONS) \
-b $(CTS_UNSUPPORTED_ABIS) \
- -a $(TARGET_ARCH) \
-o $@
diff --git a/build/test_package.mk b/build/test_package.mk
index 97f9c43..7f61e60 100644
--- a/build/test_package.mk
+++ b/build/test_package.mk
@@ -58,5 +58,4 @@
-p $(PRIVATE_TEST_PACKAGE) \
-e $(CTS_EXPECTATIONS) \
-b $(CTS_UNSUPPORTED_ABIS) \
- -a $(TARGET_ARCH) \
-o $@
diff --git a/build/test_target_java_library.mk b/build/test_target_java_library.mk
index 204bddc..d526805 100644
--- a/build/test_target_java_library.mk
+++ b/build/test_target_java_library.mk
@@ -41,6 +41,5 @@
-p $(PRIVATE_TEST_PACKAGE) \
-e $(CTS_EXPECTATIONS) \
-b $(CTS_UNSUPPORTED_ABIS) \
- -a $(TARGET_ARCH) \
-x "runtimeArgs->$(PRIVATE_RUNTIME_ARGS)" \
-o $@
diff --git a/build/test_uiautomator.mk b/build/test_uiautomator.mk
index be78f6c..7757027 100644
--- a/build/test_uiautomator.mk
+++ b/build/test_uiautomator.mk
@@ -49,5 +49,4 @@
-r $(PRIVATE_TEST_APP_PACKAGE) \
-e $(CTS_EXPECTATIONS) \
-b $(CTS_UNSUPPORTED_ABIS) \
- -a $(TARGET_ARCH) \
-o $@
diff --git a/tools/cts-xml-generator/src/com/android/cts/xmlgenerator/CtsXmlGenerator.java b/tools/cts-xml-generator/src/com/android/cts/xmlgenerator/CtsXmlGenerator.java
index f194edf..384466a 100644
--- a/tools/cts-xml-generator/src/com/android/cts/xmlgenerator/CtsXmlGenerator.java
+++ b/tools/cts-xml-generator/src/com/android/cts/xmlgenerator/CtsXmlGenerator.java
@@ -36,10 +36,10 @@
private static void usage(String[] args) {
System.err.println("Arguments: " + Arrays.asList(args));
- System.err.println("Usage: cts-xml-generator -p PACKAGE_NAME -n NAME [-t TEST_TYPE]"
- + " [-j JAR_PATH] [-i INSTRUMENTATION] [-m MANIFEST_FILE] [-e EXPECTATION_FILE]"
- + " [-b UNSUPPORTED_ABI_FILE] [-a ARCHITECTURE] [-o OUTPUT_FILE]"
- + " [-s APP_NAME_SPACE] [-x ADDITIONAL_ATTRIBUTE_KEY->VALUE]");
+ System.err.println("Usage: cts-xml-generator -p PACKAGE_NAME -n NAME [-s APP_NAME_SPACE]"
+ + " [-t TEST_TYPE] [-j JAR_PATH] [-i INSTRUMENTATION] [-m MANIFEST_FILE]"
+ + " [-e EXPECTATION_FILE] [-b UNSUPPORTED_ABI_FILE] [-o OUTPUT_FILE]"
+ + " [-x ADDITIONAL_ATTRIBUTE_KEY->VALUE]");
System.exit(1);
}
@@ -49,7 +49,6 @@
String outputPath = null;
Set<File> expectationFiles = new HashSet<File>();
Set<File> abiFiles = new HashSet<File>();
- String architecture = null;
File manifestFile = null;
String instrumentation = null;
String testType = null;
@@ -76,8 +75,6 @@
"Missing value for expectation store")));
} else if ("-b".equals(args[i])) {
abiFiles.add(new File(getArg(args, ++i, "Missing value for abi store")));
- } else if ("-a".equals(args[i])) {
- architecture = getArg(args, ++i, "Missing value for architecture");
} else if ("-o".equals(args[i])) {
outputPath = getArg(args, ++i, "Missing value for output file");
} else if ("-s".equals(args[i])) {
@@ -127,9 +124,9 @@
ExpectationStore failuresStore = ExpectationStore.parse(expectationFiles, ModeId.DEVICE);
ExpectationStore abiStore = ExpectationStore.parse(abiFiles, ModeId.DEVICE);
- XmlGenerator generator = new XmlGenerator(failuresStore, abiStore, architecture,
- appNameSpace, appPackageName, name, runner, instrumentation, targetNameSpace,
- jarPath, testType, outputPath, additionalAttributes);
+ XmlGenerator generator = new XmlGenerator(failuresStore, abiStore, appNameSpace,
+ appPackageName, name, runner, instrumentation, targetNameSpace, jarPath, testType,
+ outputPath, additionalAttributes);
generator.writePackageXml();
}
diff --git a/tools/cts-xml-generator/src/com/android/cts/xmlgenerator/XmlGenerator.java b/tools/cts-xml-generator/src/com/android/cts/xmlgenerator/XmlGenerator.java
index 1680cae..4a56a8e 100644
--- a/tools/cts-xml-generator/src/com/android/cts/xmlgenerator/XmlGenerator.java
+++ b/tools/cts-xml-generator/src/com/android/cts/xmlgenerator/XmlGenerator.java
@@ -79,14 +79,12 @@
/** ExpectationStore to filter out unsupported abis. */
private final ExpectationStore mUnsupportedAbis;
- private final String mArchitecture;
-
private final Map<String, String> mAdditionalAttributes;
XmlGenerator(ExpectationStore knownFailures, ExpectationStore unsupportedAbis,
- String architecture, String appNameSpace, String appPackageName, String name,
- String runner, String targetBinaryName, String targetNameSpace, String jarPath,
- String testType, String outputPath, Map<String, String> additionalAttributes) {
+ String appNameSpace, String appPackageName, String name, String runner,
+ String targetBinaryName, String targetNameSpace, String jarPath, String testType,
+ String outputPath, Map<String, String> additionalAttributes) {
mAppNamespace = appNameSpace;
mAppPackageName = appPackageName;
mName = name;
@@ -98,7 +96,6 @@
mOutputPath = outputPath;
mKnownFailures = knownFailures;
mUnsupportedAbis = unsupportedAbis;
- mArchitecture = architecture;
mAdditionalAttributes = additionalAttributes;
}
@@ -205,7 +202,7 @@
String className = nameCollector.toString();
nameCollector.append('#').append(test.getName());
writer.append("<Test name=\"").append(test.getName()).append("\"");
- String abis = getSupportedAbis(mUnsupportedAbis, mArchitecture, className).toString();
+ String abis = getSupportedAbis(mUnsupportedAbis, className).toString();
writer.append(" abis=\"" + abis.substring(1, abis.length() - 1) + "\"");
if (isKnownFailure(mKnownFailures, nameCollector.toString())) {
writer.append(" expectation=\"failure\"");
@@ -232,8 +229,8 @@
// Returns the list of ABIs supported by this TestCase on this architecture.
public static Set<String> getSupportedAbis(ExpectationStore expectationStore,
- String architecture, String className) {
- Set<String> supportedAbis = AbiUtils.getAbisForArch(architecture);
+ String className) {
+ Set<String> supportedAbis = AbiUtils.getAbisSupportedByCts();
Expectation e = (expectationStore == null) ? null : expectationStore.get(className);
if (e != null && !e.getDescription().isEmpty()) {
// Description should be written in the form "blah blah: abi1, abi2..."