Skip to content

Commit 91e4305

Browse files
committed
Updates to remove debug prints
1 parent c51851b commit 91e4305

File tree

6 files changed

+7
-11
lines changed

6 files changed

+7
-11
lines changed

src/main/resources/scripts/generate_lcov.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,6 @@ def generateCoverageResults(inFile, xml_data_dir = "xml_data", verbose = False,
341341
cmdStr = "genhtml " + pathToInfo + " --output-directory out"
342342
cmdArr = cmdStr.split()
343343
try:
344-
print(" *** running manage command: {}".format(cmdStr))
345344
subprocess.Popen(cmdArr).wait()
346345
return True
347346
except:

src/main/resources/scripts/generate_qa_results_xml.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,9 +187,10 @@ def genQATestResults(mp, level = None, envName = None, verbose = False, encoding
187187

188188
if level and envName:
189189
nameLevel = level + "_" + envName
190-
report_name = "{}_{}_system_tests_status.html".format(os.path.basename(self.FullManageProjectName)[:-4], nameLevel)
190+
nameLevel = nameLevel.replace("\\","/").replace("/","_")
191+
report_name = "{}_{}_system_tests_status.html".format(os.path.basename(mp)[:-4], nameLevel)
191192
else:
192-
report_name = os.path.basename(self.FullManageProjectName)[:-4] + "_system_tests_status.html"
193+
report_name = os.path.basename(mp)[:-4] + "_system_tests_status.html"
193194

194195
if os.path.exists(report_name):
195196
with open(report_name,"rb") as fd:

src/main/resources/scripts/generate_xml.py

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

670670
print(" Creating System Test Status " + self.FullManageProjectName)
671671
callStr = os.environ.get('VECTORCAST_DIR') + os.sep + "manage -p " + self.FullManageProjectName + " --system-tests-status=" + report_name
672-
print(" *** running manage command: {}".format(callStr))
673672
import subprocess
674673
p = subprocess.Popen(callStr, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True)
675674
out, err = p.communicate()
@@ -1072,7 +1071,6 @@ def __init__(self, FullManageProjectName, build_dir, env, compiler, testsuite, c
10721071
if env:
10731072
callStr += " -e " + env
10741073

1075-
print(" *** running manage command: {}{}".format(GenerateXml, callStr))
10761074
import subprocess
10771075
p = subprocess.Popen(callStr, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True)
10781076
out, err = p.communicate()

src/main/resources/scripts/getjobs.py

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

144144
somethingPrinted = False
145145
output = ""
146-
print(" *** running manage command: {}".format(manageCMD + " --project " + ManageProjectName + " --full-status"))
147146
p = subprocess.Popen(manageCMD + " --project " + ManageProjectName + " --full-status",
148147
shell=True,
149148
stdout=subprocess.PIPE,
150149
universal_newlines=True)
151150
out, err = p.communicate()
152151
enabledList = out.splitlines()
153152

154-
print(" *** running manage command: {}".format(manageCMD + " --project " + ManageProjectName + " --build-directory-name"))
155153
p = subprocess.Popen(manageCMD + " --project " + ManageProjectName + " --build-directory-name",
156154
shell=True,
157155
stdout=subprocess.PIPE,
@@ -170,6 +168,7 @@ def printEnvInfoNoDataAPI(ManageProjectName, printData = True, printEnvType = Fa
170168

171169
if indent > max_indent and indent <= veryMax:
172170
max_indent = indent
171+
last_index_max_line = line
173172

174173
if max_indent == 8:
175174
source_match_string = "^ [^\s]"
@@ -192,6 +191,9 @@ def printEnvInfoNoDataAPI(ManageProjectName, printData = True, printEnvType = Fa
192191
group_match_string = None
193192
env_match_string = "^ [^\s]"
194193
else:
194+
print("Error with full-status report")
195+
print("Highest indent is with this line\n" + last_index_max_line)
196+
print("\n".join(enabledList))
195197
raise ValueError("Error deciphering max_index: " + str(max_indent))
196198

197199
source = None

src/main/resources/scripts/managewait.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,6 @@ def __exec_manage(self, silent, logfile):
130130
popen_args["encoding"] = self.encFmt
131131
popen_args["text"] = True # optional, same as universal_newlines=True
132132

133-
print(" *** running manage command: {}".format(callStr))
134-
135133
p = subprocess.Popen(callStr, **popen_args)
136134

137135
self.stop_requested = False

src/main/resources/scripts/parallel_full_reports.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,13 @@ def generate_report(params):
7878

7979
if env_is_coverapi:
8080
cmd = VCD + "/clicast -e " + env_name + " COVER REPORT AGGREGATE " + report_name
81-
print(" *** running manage command: {}".format(cmd))
8281
process = subprocess.Popen(cmd.split(), shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=build_dir)
8382
stdout, stderr = process.communicate()
8483
# print(cmd, stdout)
8584
result = process.returncode
8685

8786
elif env_is_ut_api:
8887
cmd = VCD + "/clicast -e " + env_name + " REPORT CUSTOM FULL " + report_name
89-
print(" *** running manage command: {}".format(cmd))
9088
process = subprocess.Popen(cmd.split(), shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=build_dir)
9189
stdout, stderr = process.communicate()
9290
# print(cmd, stdout)

0 commit comments

Comments
 (0)