Accept line delimiters without carriage return in test results.
Change-Id: I4ab4b984c617623750ca648f422f76f6fb2a61d6
diff --git a/src/com/google/gct/testing/CloudResultsAdapter.java b/src/com/google/gct/testing/CloudResultsAdapter.java
index 91b7cd5..8b804fd 100644
--- a/src/com/google/gct/testing/CloudResultsAdapter.java
+++ b/src/com/google/gct/testing/CloudResultsAdapter.java
@@ -135,11 +135,15 @@
}
private byte[] getParserInput(ConfigurationResult result) {
- String configurationName = "\r\nINSTRUMENTATION_STATUS: configuration="
+ String resultString = result.getResult();
+ if (resultString.indexOf("\r\n") == -1 && resultString.indexOf("\n") != -1) {
+ //Make sure the result uses \r\n (Windows-style EOL) as line delimiter as this is what parser expects/produces.
+ resultString = resultString.replaceAll("\\n", "\r\n");
+ }
+ String configurationName = "\nINSTRUMENTATION_STATUS: configuration="
+ result.getConfigurationInstance().getResultsViewerDisplayString() + "\r\n";
String classNamePrefix = "INSTRUMENTATION_STATUS: class=";
- //Make sure the input uses \r\n (Windows-style EOL) as line delimiter as this is what parser expects/produces.
- return result.getResult().replaceAll("\\n" + classNamePrefix, configurationName + classNamePrefix).getBytes();
+ return resultString.replaceAll("\\n" + classNamePrefix, configurationName + classNamePrefix).getBytes();
}
class PollingTicker implements Runnable {
