Skip to content

Commit 2915413

Browse files
authored
update the way we get the version for FMPy (#283)
1 parent 8f4dee7 commit 2915413

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

test.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -296,11 +296,9 @@ def timeSeconds(f):
296296

297297
fmisimulatorversion = None
298298
if fmisimulator:
299+
flag = '-v' if not isFMPy(fmisimulator) else '--version'
299300
try:
300-
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')
301+
fmisimulatorversion = check_output_log([fmisimulator, flag], stderr=subprocess.STDOUT).strip()
304302
except subprocess.CalledProcessError as e:
305303
print("Failure to run %s:\n%s" %(fmisimulator, e.output))
306304
raise e

0 commit comments

Comments
 (0)