aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland Grunberg2012-09-28 11:45:24 -0400
committerCamilo Bernal2012-09-28 13:46:24 -0400
commit948b36b638442c24e7ab7707db3cd4c9a117575d (patch)
treebdeeee9d02952de62a05cee7579c39d973233ce1
parent368dc4802a22393a786af2d46527ebd61f17d732 (diff)
downloadorg.eclipse.linuxtools-948b36b638442c24e7ab7707db3cd4c9a117575d.tar.gz
org.eclipse.linuxtools-948b36b638442c24e7ab7707db3cd4c9a117575d.tar.xz
org.eclipse.linuxtools-948b36b638442c24e7ab7707db3cd4c9a117575d.zip
Update Gcov version checking to properly parse all versions >= 4.7.
A version number of 875575105 (4.07 A) is used as the smallest version that contains the new parsing format, but this excludes 875575082 (4.07 *) which gcov upstream has designated as the proper release version. Change-Id: I9f48e919024c856b247e3dda03874d69ecb54a11 Reviewed-on: https://git.eclipse.org/r/7978 Tested-by: Hudson CI Reviewed-by: Camilo Bernal <cabernal@redhat.com> IP-Clean: Camilo Bernal <cabernal@redhat.com> Tested-by: Camilo Bernal <cabernal@redhat.com>
-rw-r--r--gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/GcdaRecordsParser.java4
-rw-r--r--gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/GcnoRecordsParser.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/GcdaRecordsParser.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/GcdaRecordsParser.java
index 4075d12071..d6430a0799 100644
--- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/GcdaRecordsParser.java
+++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/GcdaRecordsParser.java
@@ -104,7 +104,7 @@ public class GcdaRecordsParser {
/*
* danielhb, 2012-08-06: Gcov versions 4.7.0 or
- * later (long value = 875575105) has different format for
+ * later (long value = 875575082) has different format for
* the data file:
*
* prior format:
@@ -120,7 +120,7 @@ public class GcdaRecordsParser {
* TL;DR Need to consume the extra long value.
*
*/
- if (version >= 875575105)
+ if (version >= 875575082)
{
// long cfgChksm = (stream.readInt()&MasksGenerator.UNSIGNED_INT_MASK);
stream.readInt();
diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/GcnoRecordsParser.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/GcnoRecordsParser.java
index 9f13314ebc..c064fd6814 100644
--- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/GcnoRecordsParser.java
+++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/GcnoRecordsParser.java
@@ -111,7 +111,7 @@ public class GcnoRecordsParser {
long fnctnChksm = (stream.readInt()&MasksGenerator.UNSIGNED_INT_MASK);
/*
* danielhb, 2012-08-06: Gcov versions 4.7.0 or
- * later (long value = 875575105) has different format for
+ * later (long value = 875575082) has different format for
* the data file:
*
* prior format:
@@ -127,7 +127,7 @@ public class GcnoRecordsParser {
* TL;DR Need to consume the extra long value.
*
*/
- if (version >= 875575105)
+ if (version >= 875575082)
{
// long cfgChksm = (stream.readInt()&MasksGenerator.UNSIGNED_INT_MASK);
stream.readInt();