From 4e26c5efcfe4f5580d8ac6fbc686787f6fbe21db Mon Sep 17 00:00:00 2001
From: "p.privalov"
Date: Thu, 20 Apr 2017 17:05:41 +0300
Subject: [PATCH] [RELEASE] DA 2.5.5
- Fix JIRA defects:
SPTSDKUX-3894: [SE][SDK][Tizen_Studio_1.2_RC3][Mobile_Emu][Testing Tool][Dynamic Analyzer ][TCM-5722] Change the trace save path
Change-Id: I4adc625e847cbaf78caf07eca52889e4c0550234
---
.../tizen/dynamicanalyzer/cli/commands/StopCommand.java | 5 ++---
.../tizen/dynamicanalyzer/cli/tracing/TracingProcess.java | 15 +++++++++++----
org.tizen.dynamicanalyzer.common.test/pom.xml | 2 +-
org.tizen.dynamicanalyzer.test/pom.xml | 2 +-
.../dynamicanalyzer.product | 2 +-
org.tizen.dynamicanalyzer.workbench.product/pom.xml | 4 ++--
package/changelog | 3 +++
package/pkginfo.manifest | 2 +-
pom.xml | 2 +-
9 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/org.tizen.dynamicanalyzer.cli/src/org/tizen/dynamicanalyzer/cli/commands/StopCommand.java b/org.tizen.dynamicanalyzer.cli/src/org/tizen/dynamicanalyzer/cli/commands/StopCommand.java
index 5f49c90..cc2a754 100644
--- a/org.tizen.dynamicanalyzer.cli/src/org/tizen/dynamicanalyzer/cli/commands/StopCommand.java
+++ b/org.tizen.dynamicanalyzer.cli/src/org/tizen/dynamicanalyzer/cli/commands/StopCommand.java
@@ -70,8 +70,6 @@ public class StopCommand extends Command {
}
File out = new File(ctx.getArgs().getOutput());
if (!out.exists()){
- String path = PathManager.DA_TEMP_FOLDER_PATH + File.separator + "unsaved_trace.zip";
- CliInternals.saveTrace(path);
System.out.format(
"DA tracing finished.%n" +
"Total time: %s%n" +
@@ -79,7 +77,8 @@ public class StopCommand extends Command {
"Failed to save in %s%n" +
"Raw data can be found in %s%n",
duration,
- tracingTime, ctx.getArgs().getOutput(), path);
+ tracingTime, ctx.getArgs().getOutput(),
+ PathManager.DA_TEMP_FOLDER_PATH + File.separator + "unsaved_trace.zip");
return ExitCode.EX_OPERATION_FAILED;
}
System.out.format(
diff --git a/org.tizen.dynamicanalyzer.cli/src/org/tizen/dynamicanalyzer/cli/tracing/TracingProcess.java b/org.tizen.dynamicanalyzer.cli/src/org/tizen/dynamicanalyzer/cli/tracing/TracingProcess.java
index d80abe7..300c0fd 100644
--- a/org.tizen.dynamicanalyzer.cli/src/org/tizen/dynamicanalyzer/cli/tracing/TracingProcess.java
+++ b/org.tizen.dynamicanalyzer.cli/src/org/tizen/dynamicanalyzer/cli/tracing/TracingProcess.java
@@ -1,5 +1,6 @@
package org.tizen.dynamicanalyzer.cli.tracing;
+import java.io.File;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
@@ -14,6 +15,7 @@ import org.tizen.dynamicanalyzer.cli.utils.ProcessCommunicationProcessor;
import org.tizen.dynamicanalyzer.common.DAResult.ErrorCode;
import org.tizen.dynamicanalyzer.common.DAState;
import org.tizen.dynamicanalyzer.common.Global;
+import org.tizen.dynamicanalyzer.common.path.PathManager;
import org.tizen.dynamicanalyzer.util.InternalLogger;
import org.tizen.dynamicanalyzer.util.Logger;
@@ -115,10 +117,13 @@ public class TracingProcess {
/**
* Save tracing results.
*
+ * @param string location to save trace
* @return true
if save was successful
*/
- public boolean saveTrace() {
- return CliInternals.saveTrace(args.getOutput());
+ public boolean saveTrace(String dest) {
+ if (dest == null || dest.isEmpty())
+ return CliInternals.saveTrace(args.getOutput());
+ return CliInternals.saveTrace(dest);
}
/**
@@ -212,8 +217,10 @@ public class TracingProcess {
}
// save collected trace
- if (!tracingProcess.saveTrace()) {
- Logger.error("Failed to save tracing results");
+ if (!tracingProcess.saveTrace(null)) {
+ Logger.error("Failed to save tracing results.%nSaving results in temp folder.");
+ tracingProcess.saveTrace(
+ PathManager.DA_TEMP_FOLDER_PATH + File.separator + "unsaved_trace.zip");
return ErrorCode.ERR_EXCEPTION_OCCURRED;
}
diff --git a/org.tizen.dynamicanalyzer.common.test/pom.xml b/org.tizen.dynamicanalyzer.common.test/pom.xml
index 825c559..88948f7 100644
--- a/org.tizen.dynamicanalyzer.common.test/pom.xml
+++ b/org.tizen.dynamicanalyzer.common.test/pom.xml
@@ -6,7 +6,7 @@
dynamic-analyzer
org.tizen.dynamicanalyzer
- 2.5.4-SNAPSHOT
+ 2.5.5-SNAPSHOT
..
org.tizen.dynamicanalyzer
diff --git a/org.tizen.dynamicanalyzer.test/pom.xml b/org.tizen.dynamicanalyzer.test/pom.xml
index adf4dc1..d87816a 100644
--- a/org.tizen.dynamicanalyzer.test/pom.xml
+++ b/org.tizen.dynamicanalyzer.test/pom.xml
@@ -6,7 +6,7 @@
dynamic-analyzer
org.tizen.dynamicanalyzer
- 2.5.4-SNAPSHOT
+ 2.5.5-SNAPSHOT
..
org.tizen.dynamicanalyzer
diff --git a/org.tizen.dynamicanalyzer.workbench.product/dynamicanalyzer.product b/org.tizen.dynamicanalyzer.workbench.product/dynamicanalyzer.product
index 91a2ab3..fd74cd5 100644
--- a/org.tizen.dynamicanalyzer.workbench.product/dynamicanalyzer.product
+++ b/org.tizen.dynamicanalyzer.workbench.product/dynamicanalyzer.product
@@ -1,7 +1,7 @@
-
+
diff --git a/org.tizen.dynamicanalyzer.workbench.product/pom.xml b/org.tizen.dynamicanalyzer.workbench.product/pom.xml
index 9b5de6a..12eed83 100644
--- a/org.tizen.dynamicanalyzer.workbench.product/pom.xml
+++ b/org.tizen.dynamicanalyzer.workbench.product/pom.xml
@@ -8,13 +8,13 @@
dynamic-analyzer
org.tizen.dynamicanalyzer
- 2.5.4-SNAPSHOT
+ 2.5.5-SNAPSHOT
..
org.tizen.dynamicanalyzer
org.tizen.dynamicanalyzer.workbench.product
- 2.5.4-SNAPSHOT
+ 2.5.5-SNAPSHOT
eclipse-repository
diff --git a/package/changelog b/package/changelog
index 8994bee..e18b5ff 100644
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,6 @@
+* 2.5.5
+- Fix JIRA defects:
+ SPTSDKUX-3894: [SE][SDK][Tizen_Studio_1.2_RC3][Mobile_Emu][Testing Tool][Dynamic Analyzer ][TCM-5722] Change the trace save path
* 2.5.4
- Fix JIRA defects:
SPTSDKUX-3792: On screen transaction screenshot feature is not working in DA
diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index c8e483b..35d483c 100644
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,5 +1,5 @@
Source:dynamic-analyzer
-Version:2.5.4
+Version:2.5.5
Maintainer:Gihun Chang , WooJin Jung , Jaewon Lim , Seokgil Kang
Package:dynamic-analyzer-product
diff --git a/pom.xml b/pom.xml
index 840f02c..aef7e88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
4.0.0
org.tizen.dynamicanalyzer
dynamic-analyzer
- 2.5.4-SNAPSHOT
+ 2.5.5-SNAPSHOT
pom
--
2.7.4