feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Squish: Do not use shell in getOutputFromCmdline

Browse Source 
Change-Id: I731b119169063912cd3b528a1a6a58727002ae67
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Robert Loehning
2016-05-26 18:51:15 +02:00
parent b4e11b191b
commit c1e7cf84e4
7 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/system/shared/qtcreator.py
+1 -1
View File
@@ -118,7 +118,7 @@ def waitForCleanShutdown(timeOut=10):
if not shutdownDone and datetime.utcnow() > endtime:
break
if platform.system() == 'Linux' and JIRA.isBugStillOpen(15749):
pgrepOutput = getOutputFromCmdline('pgrep -f qtcreator_process_stub')
pgrepOutput = getOutputFromCmdline(["pgrep", "-f", "qtcreator_process_stub"])
pids = pgrepOutput.splitlines()
if len(pids):
print("Killing %d qtcreator_process_stub instances" % len(pids))