echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CTest: Fix GTM coverage handling of entry point named "%"

Browse Source 
Removing the "%" character from the name of the routine in the line
parser causes CTest to be unable to find a routine entry point that is
only named "%".  Instead leave it during line parsing and handle routine
names ending in "%" explicitly when loading files.
This commit is contained in:
Joseph Snyder 2018-10-15 13:57:42 +00:00 committed by Brad King
parent 6c281138a5
commit f7d92deff4
5 changed files with 48 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/CTest/cmParseGTMCoverage.cxx
View File

@ -1,5 +1,6 @@
#include "cmParseGTMCoverage.h"
#include "cmAlgorithms.h"
#include "cmCTest.h"
#include "cmCTestCoverageHandler.h"
#include "cmSystemTools.h"
@ -86,6 +87,10 @@ bool cmParseGTMCoverage::ReadMCovFile(const char* file)
}
// Find the full path to the file
bool found = this->FindMumpsFile(routine, filepath);
if (!found && cmHasLiteralSuffix(routine, "%")) {
routine.erase(0, 1);
found = this->FindMumpsFile(routine, filepath);
}
if (found) {
int lineoffset = 0;
if (this->FindFunctionInMumpsFile(filepath, function, lineoffset)) {
@ -192,8 +197,8 @@ bool cmParseGTMCoverage::ParseMCOVLine(std::string const& line,
done = true;
}
} else {
// all chars except ", (, and % get stored in the arg string
if (cur != '\"' && cur != '(' && cur != '%') {
// all chars except " and ( get stored in the arg string
if (cur != '\"' && cur != '(') {
arg.append(1, line[pos]);
}
}

4
Tests/CMakeLists.txt
View File

@ -2669,7 +2669,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
$<TARGET_FILE:ctest> -T Coverage --debug)
set_tests_properties(CTestGTMCoverage PROPERTIES
PASS_REGULAR_EXPRESSION
"Process file.*ZZCOVTST.m.*Total LOC:.*30.*Percentage Coverage: 80.00*"
"Process file.*ZZCOVTST.m.*Total LOC:.*32.*Percentage Coverage: 81.25*"
ENVIRONMENT COVFILE=)
configure_file(
@ -2687,7 +2687,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
$<TARGET_FILE:ctest> -T Coverage --debug)
set_tests_properties(CTestCacheCoverage PROPERTIES
PASS_REGULAR_EXPRESSION
"Process file.*ZZCOVTST.m.*Total LOC:.*29.*Percentage Coverage: 86.21.*"
"Process file.*ZZCOVTST.m.*Total LOC:.*32.*Percentage Coverage: 87.50.*"
ENVIRONMENT COVFILE=)
# Adding a test case for Python Coverage

3
Tests/MumpsCoverage/VistA-FOIA/Packages/Uncategorized/ZZCOVTST.m
View File

@ -12,6 +12,9 @@ EN ; This entry point shouldn't be found without fixing
; This line not executable
D T6^ZZCOVTST
;
% ; a line to test for a problem where % was dropped
N Do,Re,Mi
S Do="A#"
T1 ; This line should always be found
N D
S D=2

63
Tests/MumpsCoverage/ZZCOVTST.cmcov
View File

@ -13,33 +13,36 @@ ZZCOVTST,1,1,"ZZCOVTST;OSEHRA/JPS -- Test routine for Coverage Parsing;4/28/2014
,12,1," Q"
,13,0," ; This line not executable"
,14,0," ;"
,15,0,"T1 ; This line should always be found"
,16,1," N D"
,17,1," S D=2"
,18,1," W !,D,!,""This is the second entry point"",!"
,19,1," D T2^ZZCOVTST(D)"
,20,1," Q"
,21,0," ;"
,22,0,"T2(EQ) ; This is debatable and only called with ENT^ROU notation"
,23,1," N D"
,24,1," S D=3"
,25,1," W !,D,!,EQ,""This is the third entry point"",!"
,26,1," D T3^ZZCOVTST"
,27,1," Q"
,28,0," ;"
,29,1,"T3 N D S D=4 W D,!,""Fourth Entry point"",! Q"
,30,0," ;"
,31,0,"T4 N D S D=5 W ""Shouldn't be executed"""
,32,0," W ""Lots to not do"""
,33,0," Q"
,34,1,"T5(EQ) ;this entry point is called with a $$ notation"
,35,1," W ""THIS IS THE $$ NOTATION!"",!"
,36,1," Q 0"
,37,0,"T6 ; An entry point to show comments inside of ""DO"" blocks"
,38,1," D"
,39,1," . W ""This is executable code"",!"
,40,0," . ; This is a comment inside the do block, not executable"
,41,1," . S ZZBLAH=""blah"""
,42,1," W ""Ending T6"",!"
,43,0," ;"
Totals for ZZCOVTST,,25,
,15,1,"% ; a line to test for a problem where % was dropped"
,16,1,"N Do,Re,Mi"
,17,1,"S Do=""A#"""
,18,0,"T1 ; This line should always be found"
,19,1," N D"
,20,1," S D=2"
,21,1," W !,D,!,""This is the second entry point"",!"
,22,1," D T2^ZZCOVTST(D)"
,23,1," Q"
,24,0," ;"
,25,0,"T2(EQ) ; This is debatable and only called with ENT^ROU notation"
,26,1," N D"
,27,1," S D=3"
,28,1," W !,D,!,EQ,""This is the third entry point"",!"
,29,1," D T3^ZZCOVTST"
,30,1," Q"
,31,0," ;"
,32,1,"T3 N D S D=4 W D,!,""Fourth Entry point"",! Q"
,33,0," ;"
,34,0,"T4 N D S D=5 W ""Shouldn't be executed"""
,35,0," W ""Lots to not do"""
,36,0," Q"
,37,1,"T5(EQ) ;this entry point is called with a $$ notation"
,38,1," W ""THIS IS THE $$ NOTATION!"",!"
,39,1," Q 0"
,40,0,"T6 ; An entry point to show comments inside of ""DO"" blocks"
,41,1," D"
,42,1," . W ""This is executable code"",!"
,43,0," . ; This is a comment inside the do block, not executable"
,44,1," . S ZZBLAH=""blah"""
,45,1," W ""Ending T6"",!"
,46,0," ;"
Toals for ZZCOVTST,,28,

3
Tests/MumpsCoverage/ZZCOVTST.mcov
View File

@ -9,6 +9,9 @@ GT.M 15-AUG-2014 10:14:32 ZWR
^ZZCOVERAGE("ZZCOVTST","EN",4)="1:0:0:0:74"
^ZZCOVERAGE("ZZCOVTST","EN",5)="1:0:0:0:66"
^ZZCOVERAGE("ZZCOVTST","EN",6)="1:0:0:0:40"
^ZZCOVERAGE("ZZCOVTST","%")="2:0:0:0:208"
^ZZCOVERAGE("ZZCOVTST","%",1)="2:0:0:0:208"
^ZZCOVERAGE("ZZCOVTST","%",2)="2:0:0:0:208"
^ZZCOVERAGE("ZZCOVTST","T1")="1:0:0:0:208"
^ZZCOVERAGE("ZZCOVTST","T1",1)="1:0:0:0:23"
^ZZCOVERAGE("ZZCOVTST","T1",2)="1:0:0:0:24"