Skip to content

Commit cfd08da

Browse files
TimSVectorTimSVector
committed
Added Debug Print
1 parent e33cd77 commit cfd08da

14 files changed

+49
-3
lines changed

‎src/main/resources/scripts/cobertura.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,10 +393,12 @@ def procesCoverage(coverXML, coverApi, extended = False, source_root = ""):
393393

394394
def runCoverageResultsMP(packages, mpFile, verbose = False, extended=False, source_root = ""):
395395

396+
print("cobertura::runCoverageResultsMP : vcproj = VCProjectApi(mpFile)")
396397
vcproj = VCProjectApi(mpFile)
397398
api = vcproj.project.cover_api
398399
results = runCoberturaResults(packages, api, verbose = False, extended = extended, source_root = source_root)
399400
vcproj.close()
401+
print("cobertura::runCoverageResultsMP : vcproj.close()")
400402

401403
return results
402404

‎src/main/resources/scripts/copy_build_dir.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ def run(ManageProjectName, Level, BaseName, Env, workspace, vCastProjectWorkspac
179179

180180
manageCMD = os.path.join(os.environ.get('VECTORCAST_DIR'), "manage")
181181
cmd = manageCMD + " --project " + ManageProjectName + " --build-directory-name --level " + Level + " -e " + Env
182+
print(" *** running manage command: {}".format(cmd))
182183
p = subprocess.Popen(cmd,
183184
shell=True,
184185
stdout=subprocess.PIPE,
@@ -237,10 +238,12 @@ def run(ManageProjectName, Level, BaseName, Env, workspace, vCastProjectWorkspac
237238

238239
def getVcastProjectWorkspace(args):
239240

241+
print("copy_build_dir::getVcastProjectWorkspace : api = VCProjectApi(args.ManageProject)")
240242
api = VCProjectApi(args.ManageProject)
241243
vCastProjectWorkspace = api.project.workspace
242244
api.close()
243-
245+
print("copy_build_dir::getVcastProjectWorkspace : api.close()")
246+
244247
return vCastProjectWorkspace
245248

246249
if __name__ == '__main__':

‎src/main/resources/scripts/create_index_html.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ def create_index_html(mpName, isGitLab = False, output_dir = ""):
103103
global baseOutputDir
104104
baseOutputDir = output_dir
105105

106+
print("create_index_html::create_index_html : vcproj = VCProjectApi(mpName)")
106107
vcproj = VCProjectApi(mpName)
107108

108109
# Set custom report directory to the where this script was
@@ -121,6 +122,7 @@ def create_index_html(mpName, isGitLab = False, output_dir = ""):
121122
customization_dir=rep_path)
122123

123124
vcproj.close()
125+
print("create_index_html::create_index_html : vvcproj.close()")
124126

125127
def create_index_html_body ():
126128

‎src/main/resources/scripts/generate-results.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -541,13 +541,15 @@ def buildReports(FullManageProjectName = None,
541541
print("Cleanup: " + str(time.time()))
542542
if useNewReport and not legacy:
543543
try:
544+
print("generate-results::buildReports : vcproj = VCProjectApi(FullManageProjectName)")
544545
vcproj = VCProjectApi(FullManageProjectName)
545546
tool_version = vcproj.tool_version
546547
if tool_version.startswith("20"):
547548
use_manage_api = False
548549
else:
549550
use_manage_api = True
550551
vcproj.close()
552+
print("generate-results::buildReports : vcproj.close()")
551553
except:
552554
use_manage_api = False
553555

‎src/main/resources/scripts/generate_lcov.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,12 @@ def get_function_name_line_number(file_path, function, initial_guess):
144144

145145
def runCoverageResultsMP(mpFile, verbose = False, testName = "", source_root = ""):
146146

147+
print("generate_lcov::runCoverageResultsMP : vcproj = VCProjectApi(mpFile)")
147148
vcproj = VCProjectApi(mpFile)
148149
api = vcproj.project.cover_api
149150
results = runGcovResults(api, verbose = verbose, testName = vcproj.project.name, source_root=source_root)
150151
vcproj.close()
152+
print("generate_lcov::runCoverageResultsMP : vcproj.close()")
151153

152154
return results
153155

@@ -341,6 +343,7 @@ def generateCoverageResults(inFile, xml_data_dir = "xml_data", verbose = False,
341343
cmdStr = "genhtml " + pathToInfo + " --output-directory out"
342344
cmdArr = cmdStr.split()
343345
try:
346+
print(" *** running manage command: {}".format(cmdStr))
344347
subprocess.Popen(cmdArr).wait()
345348
return True
346349
except:

‎src/main/resources/scripts/generate_pclp_reports.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,7 @@ def generate_html_report(mpName, input_xml, output_html):
339339
if output_html is None:
340340
output_html = "pclp_findings.html"
341341

342+
print("generate_pclp_reports::generate_html_report : vcproj = VCProjectApi(mpFile)")
342343
vcproj = VCProjectApi(mpName)
343344

344345
# Set custom report directory to the where this script was
@@ -354,6 +355,7 @@ def generate_html_report(mpName, input_xml, output_html):
354355
customization_dir=rep_path)
355356

356357
vcproj.close()
358+
print("generate_pclp_reports::generate_html_report : vcproj.close()")
357359

358360
def has_any_coverage(line):
359361

‎src/main/resources/scripts/generate_qa_results_xml.py‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,9 @@ def processSystemTestResultsData(lines, encoding = 'utf-8'):
185185

186186
def saveQATestStatus(mp):
187187
callStr = os.environ.get('VECTORCAST_DIR') + os.sep + "manage -p " + mp + " --system-tests-status=" + os.path.basename(mp)[:-4] + "_system_tests_status.html"
188+
189+
print(" *** running manage command: {}".format(cmdStr))
190+
188191
p = subprocess.Popen(callStr, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True)
189192
out, err = p.communicate()
190193

@@ -203,7 +206,9 @@ def genQATestResults(mp, level = None, envName = None, verbose = False, encoding
203206
callStr += " --level " + level
204207
if envName:
205208
callStr += " -e " + envName
206-
209+
210+
print(" *** running manage command: {}".format(callStr))
211+
207212
p = subprocess.Popen(callStr, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True)
208213
out, err = p.communicate()
209214

‎src/main/resources/scripts/generate_sonarqube_testresults.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,7 @@ def __init__(self, FullManageProjectName, verbose = False,
259259

260260
super(GenerateManageXml, self).__init__(FullManageProjectName, verbose, xml_data_dir)
261261

262+
print("generate_sonarqube_testresults::__init__ : self.api = VCProjectApi(FullManageProjectName)")
262263
self.api = VCProjectApi(FullManageProjectName)
263264

264265
self.FullManageProjectName = FullManageProjectName
@@ -280,6 +281,7 @@ def __init__(self, FullManageProjectName, verbose = False,
280281
def __del__(self):
281282
try:
282283
self.api.close()
284+
print("generate_sonarqube_testresults::__init__ : self.api.close()")
283285
except:
284286
pass
285287

@@ -559,6 +561,7 @@ def generate_unit(self):
559561
if isinstance(self.api, CoverApi):
560562
try:
561563
if self.topLevelAPI == None:
564+
print("generate_sonarqube_testresults.py::generate_unit : api = VCProjectApi(self.FullManageProjectName)")
562565
api = VCProjectApi(self.FullManageProjectName)
563566
else:
564567
api = self.topLevelAPI
@@ -587,6 +590,7 @@ def generate_unit(self):
587590

588591
if self.topLevelAPI == None:
589592
api.close()
593+
print("generate_sonarqube_testresults.py::generate_unit : api.close()")
590594

591595
except ImportError as e:
592596
from generate_qa_results_xml import genQATestResults

‎src/main/resources/scripts/generate_xml.py‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -635,6 +635,7 @@ def __init__(self, FullManageProjectName, verbose = False,
635635
use_cte = False):
636636

637637
super(GenerateManageXml, self).__init__(FullManageProjectName, verbose, teePrint, use_cte)
638+
print("GenerateManageXml::__init__ : api = VCProjectApi(self.FullManageProjectName)")
638639
self.api = VCProjectApi(FullManageProjectName)
639640

640641
try:
@@ -682,6 +683,7 @@ def cleanupXmlDataDir(self):
682683
def __del__(self):
683684
try:
684685
self.api.close()
686+
print("GenerateManageXml::__del__ : self.api.close()")
685687
except:
686688
pass
687689

@@ -1073,6 +1075,7 @@ def generate_unit(self):
10731075
self.start_system_test_file()
10741076

10751077
if self.topLevelAPI == None:
1078+
print("GenerateXml::generate_unit: api = VCProjectApi(self.FullManageProjectName)")
10761079
api = VCProjectApi(self.FullManageProjectName)
10771080
else:
10781081
api = self.topLevelAPI
@@ -1097,6 +1100,7 @@ def generate_unit(self):
10971100

10981101
if self.topLevelAPI == None:
10991102
api.close()
1103+
print("GenerateXml::generate_unit: api.close()")
11001104

11011105
except ImportError as e:
11021106
from generate_qa_results_xml import genQATestResults
@@ -1175,6 +1179,7 @@ def start_system_test_file(self):
11751179
from vector.apps.DataAPI.vcproject_api import VCProjectApi
11761180

11771181
if self.topLevelAPI == None:
1182+
print("GenerateXml::start_system_test_file: api = VCProjectApi(self.FullManageProjectName)")
11781183
api = VCProjectApi(self.FullManageProjectName)
11791184
else:
11801185
api = self.topLevelAPI
@@ -1192,7 +1197,7 @@ def start_system_test_file(self):
11921197

11931198
if self.topLevelAPI == None:
11941199
api.close()
1195-
api = None
1200+
print("GenerateXml::start_system_test_file: api = api.close()")
11961201

11971202
self.fh_data = ""
11981203
self.fh_data += ("<?xml version=\"1.0\" encoding=\"" + self.encFmt.upper() + "\"?>\n")

‎src/main/resources/scripts/getjobs.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,13 +143,15 @@ def printEnvInfoNoDataAPI(ManageProjectName, printData = True, printEnvType = Fa
143143

144144
somethingPrinted = False
145145
output = ""
146+
print(" *** running manage command: {}".format(manageCMD + " --project " + ManageProjectName + " --full-status"))
146147
p = subprocess.Popen(manageCMD + " --project " + ManageProjectName + " --full-status",
147148
shell=True,
148149
stdout=subprocess.PIPE,
149150
universal_newlines=True)
150151
out, err = p.communicate()
151152
enabledList = out.splitlines()
152153

154+
print(" *** running manage command: {}".format(manageCMD + " --project " + ManageProjectName + " --build-directory-name"))
153155
p = subprocess.Popen(manageCMD + " --project " + ManageProjectName + " --build-directory-name",
154156
shell=True,
155157
stdout=subprocess.PIPE,
@@ -234,9 +236,11 @@ def printEnvironmentInfo(ManageProjectName, printData = True, printEnvType = Fal
234236
try:
235237

236238
from vector.apps.DataAPI.vcproject_api import VCProjectApi
239+
print("getjobs::printEnvironmentInfo: api = VCProjectApi(ManageProjectName)")
237240
api = VCProjectApi(ManageProjectName)
238241
ret_info = printEnvInfoDataAPI(api, printData, printEnvType)
239242
api.close()
243+
print("getjobs::printEnvironmentInfo: api.close()")
240244
return ret_info
241245

242246

0 commit comments

Comments
 (0)