summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkh5325.kim <kh5325.kim@samsung.com>2013-06-30 14:42:47 +0900
committerkh5325.kim <kh5325.kim@samsung.com>2013-06-30 14:42:47 +0900
commita5adef3f88c6235205734897cb3a481e5a3702b3 (patch)
treed2b249446c734f47bb66ab7d87f471a12b83baf9
parent47ef1ed153036dad90491d3af59e61c1a1ecf4a1 (diff)
downloadcodecoverage-eplugin-a5adef3f88c6235205734897cb3a481e5a3702b3.tar.gz
codecoverage-eplugin-a5adef3f88c6235205734897cb3a481e5a3702b3.tar.bz2
codecoverage-eplugin-a5adef3f88c6235205734897cb3a481e5a3702b3.zip
Upload tizen_2.2 source
Change-Id: I3774b9c1fc7ac4c6cede0bcffaacbc2b085d082b
-rw-r--r--org.tizen.codecoverage/src/org/tizen/codecoverage/helper/GcovHelper.java17
-rw-r--r--package/changelog3
-rw-r--r--package/pkginfo.manifest2
3 files changed, 21 insertions, 1 deletions
diff --git a/org.tizen.codecoverage/src/org/tizen/codecoverage/helper/GcovHelper.java b/org.tizen.codecoverage/src/org/tizen/codecoverage/helper/GcovHelper.java
index 8af71d3..34672cc 100644
--- a/org.tizen.codecoverage/src/org/tizen/codecoverage/helper/GcovHelper.java
+++ b/org.tizen.codecoverage/src/org/tizen/codecoverage/helper/GcovHelper.java
@@ -146,6 +146,23 @@ public class GcovHelper {
for (String gcdaPath: gcdaPathsInGcno) {
dstFile = new Path(gcdaPath).removeLastSegments(1).toString();
srcFile = targetPath + gcdaPath;
+
+ srcFile = srcFile.replaceAll("//", "/");
+ srcFile = srcFile.replaceAll("/", "'/'");
+ int startPos = 0;
+ int endPos = srcFile.length();
+ if ( srcFile.startsWith("'/") ) {
+ startPos += 1;
+ }
+ if ( srcFile.endsWith("/'") ) {
+ endPos -= 1;
+ }
+ else {
+ srcFile += "'";
+ endPos += 1;
+ }
+
+ srcFile = srcFile.substring(startPos, endPos);
SyncResult syncSuccess = syncService.pull( currentDevice.getFileEntry( srcFile ), dstFile);
if (syncSuccess.getCode() != RESULT_OK) {
diff --git a/package/changelog b/package/changelog
index d943cb5..ab6add9 100644
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,6 @@
+* 2.2.5
+- Fixed code coverage result is not shown on windows
+= gune.kim <gune.kim@samsung.com> 2013-06-29
* 2.2.4
- Modified error message.
= gune.kim <gune.kim@samsung.com> 2013-06-24
diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 0cde259..82f03af 100644
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version:2.2.4
+Version:2.2.5
Source:codecoverage-eplugin
Maintainer:kangho kim <kh5325.kim@samsung.com>, yoonki park <yoonki.park@samsung.com>, hyunsik non <hyunsik.noh@samsung.com>, taeyoung son <taeyoung2.son@samsung.com>, gune Kim <gune.kim@samsung.com>, ho namkoong <ho.namkoong@samsung.com>, hyeongseok heo <hyeong-seok.heo@samsung.com>, gyeongseok seo <gyeongseok.seo@samsung.com>, jihoon song <jihoon80.song@samsung.com>, changhyun lee <changhyun1.lee@samsung.com>, bonyong lee <bonyong.lee@samsung.com>