Browse Source

Fix superfluous addition "/jplotter" to cmd line

If jplotter was specified on the command line the Action would add
"/jplotter" making everything (compare_MS_numerically.py) #FAIL big time
master
haavee 8 months ago
parent
commit
cc791746ab
  1. 12
      ES085A/test_ES085A.py

12
ES085A/test_ES085A.py

@ -102,7 +102,7 @@ InstallDirAction = SetBinaries(BaseAction, _j2ms2_fn_=lambda s: os.path.join(s.p
BuildDirAction = SetBinaries(BaseAction, _j2ms2_fn_=lambda s: os.path.join(s.path__, "apps/j2ms2/j2ms2"),
_tConvert_fn_=lambda s: os.path.join(s.path__, "apps/tConvert/tConvert"))
# The jplotterAction will set the 'jplpath__' attribute if on the command line
jplotterAction = SetBinaries(BaseAction, _jplotter_fn_=lambda s: os.path.join(s.jplpath__, "jplotter"))
jplotterAction = SetBinaries(BaseAction, _jplotter_fn_=lambda s: s.jplpath__)
@ -254,9 +254,8 @@ class TTC(unittest.TestCase):
jplEnv = copy.deepcopy(os.environ)
# Make sure the pythonpath to jplotter is added
jplEnv['PYTHONPATH'] = ":".join(filter(operator.truth,
[os.path.join(TTC.__rootdir__, "../python"),
os.path.dirname(options.binaries.jplotter),
jplEnv.get('PYTHONPATH', None)]))
[os.path.dirname(options.binaries.jplotter),
os.environ.get('PYTHONPATH', None)]))
print("Start", cmd)
with open( os.path.join(TTC.__workdir__, 'testAA.log'), 'w' ) as lf:
lf.write( datetime.datetime.now().isoformat() + '\n' )
@ -315,9 +314,8 @@ class TTC(unittest.TestCase):
jplEnv = copy.deepcopy(os.environ)
# Make sure the pythonpath to jplotter is added
jplEnv['PYTHONPATH'] = ":".join(filter(operator.truth,
[os.path.join(TTC.__rootdir__, "../python"),
os.path.dirname(options.binaries.jplotter),
jplEnv.get('PYTHONPATH', None)]))
[os.path.dirname(options.binaries.jplotter),
os.environ.get('PYTHONPATH', None)]))
print("Start", cmd)
with open( os.path.join(TTC.__workdir__, 'testBA.log'), 'w' ) as lf:
lf.write( datetime.datetime.now().isoformat() + '\n' )

Loading…
Cancel
Save