We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 8f4dee7 commit 2915413Copy full SHA for 2915413
test.py
@@ -296,11 +296,9 @@ def timeSeconds(f):
296
297
fmisimulatorversion = None
298
if fmisimulator:
299
+ flag = '-v' if not isFMPy(fmisimulator) else '--version'
300
try:
- if not isFMPy(fmisimulator):
301
- fmisimulatorversion = check_output_log([fmisimulator, "-v"], stderr=subprocess.STDOUT).strip()
302
- else:
303
- fmisimulatorversion = subprocess.getoutput(fmisimulator + " -h | grep version | tr '\n' ' ' | tr -s ' '" ).strip().encode('ascii')
+ fmisimulatorversion = check_output_log([fmisimulator, flag], stderr=subprocess.STDOUT).strip()
304
except subprocess.CalledProcessError as e:
305
print("Failure to run %s:\n%s" %(fmisimulator, e.output))
306
raise e
0 commit comments