am 3f9dc7ae: Merge "Allow saving log files in different directory" into gingerbread
* commit '3f9dc7ae87c47c76d5441e1ba39459bb45112fa3':
Allow saving log files in different directory
diff --git a/tools/host/src/com/android/cts/HostConfig.java b/tools/host/src/com/android/cts/HostConfig.java
index 116a46f..fbea3a5 100644
--- a/tools/host/src/com/android/cts/HostConfig.java
+++ b/tools/host/src/com/android/cts/HostConfig.java
@@ -63,6 +63,7 @@
"logo.gif", "newrule-green.png"};
private String mConfigRoot;
+ private String mLogRoot;
private CaseRepository mCaseRepos;
private ResultRepository mResultRepos;
private PlanRepository mPlanRepos;
@@ -174,6 +175,13 @@
String planRoot = repositoryRoot + File.separator + planCfg;
String resRoot = repositoryRoot + File.separator + resCfg;
+ String logCfg = getStringAttributeValueOpt(doc, "TestLog", "path", fileName);
+ if (null == logCfg) {
+ mLogRoot = mConfigRoot;
+ } else {
+ mLogRoot = repositoryRoot + File.separator + logCfg;
+ }
+
boolean validCase = true;
if (!validateDirectory(caseRoot)) {
validCase = new File(caseRoot).mkdirs();
@@ -189,12 +197,16 @@
if (!validateDirectory(planRoot)) {
validPlan = new File(planRoot).mkdirs();
}
+ boolean validLog = true;
+ if (!validateDirectory(mLogRoot)) {
+ validLog = new File(mLogRoot).mkdirs();
+ }
mCaseRepos = new CaseRepository(caseRoot);
mResultRepos = new ResultRepository(resRoot);
mPlanRepos = new PlanRepository(planRoot);
- return validCase && validRes && validPlan;
+ return validCase && validRes && validPlan && validLog;
}
/**
@@ -285,6 +297,15 @@
}
/**
+ * Get the root directory of log files.
+ *
+ * @return the root directory of log files.
+ */
+ public String getLogRoot() {
+ return mLogRoot;
+ }
+
+ /**
* Get string attribute value.
*
* @param doc The document.
@@ -317,6 +338,29 @@
}
/**
+ * Get string attribute value if it exists.
+ *
+ * @param doc The document.
+ * @param tagName The tag name.
+ * @param attrName The attribute name.
+ * @param fileName The file name.
+ * @return The attribute value.
+ */
+ private String getStringAttributeValueOpt(final Document doc,
+ final String tagName, final String attrName, final String fileName) {
+
+ String cfgStr = null;
+ try {
+ cfgStr = getStringAttributeValue(doc
+ .getElementsByTagName(tagName).item(0), attrName);
+ } catch (Exception e) {
+ return null;
+ }
+
+ return cfgStr;
+ }
+
+ /**
* Load configuration values from config file.
*
* @param doc The document from which to load the values.
diff --git a/tools/host/src/com/android/cts/TestHost.java b/tools/host/src/com/android/cts/TestHost.java
index e18bc79..52a0553 100644
--- a/tools/host/src/com/android/cts/TestHost.java
+++ b/tools/host/src/com/android/cts/TestHost.java
@@ -362,7 +362,7 @@
exit();
}
- Log.initLog(sConfig.getConfigRoot());
+ Log.initLog(sConfig.getLogRoot());
sConfig.loadRepositories();
} catch (Exception e) {
Log.e("Error while parsing cts config file", e);