research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[SCons] Fix PYTHONPATH used by test suite

Browse source 
This was broken by changes made in r2535.
This commit is contained in:
Ray Speth 2013-12-09 01:34:11 +00:00
parent 3e4ccd4027
commit b280af2af1
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/SConscript
View file

@ -10,7 +10,7 @@ localenv.Append(LIBS=['gtest'] + localenv['cantera_libs'],
CCFLAGS=env['warning_flags']) CCFLAGS=env['warning_flags'])
#localenv['ENV']['PYTHONPATH'] = Dir('#interfaces/python').abspath #localenv['ENV']['PYTHONPATH'] = Dir('#interfaces/python').abspath
localenv['ENV']['PYTHONPATH'] = Dir('#interfaces/python').abspath + ':/usr/netpub/numpy/numpy-1.6.2/lib/python2.7/site-packages' localenv['ENV']['PYTHONPATH'] = Dir('#interfaces/python').abspath
localenv['ENV']['CANTERA_DATA'] = Dir('#build/data').abspath localenv['ENV']['CANTERA_DATA'] = Dir('#build/data').abspath
#print localenv.Dump() #print localenv.Dump()

2
test_problems/SConscript
View file

@ -5,7 +5,7 @@ localenv = env.Clone()
localenv.Prepend(CPPPATH=['#include', '#src', 'shared']) localenv.Prepend(CPPPATH=['#include', '#src', 'shared'])
localenv.Append(CCFLAGS=env['warning_flags']) localenv.Append(CCFLAGS=env['warning_flags'])
os.environ['PYTHONPATH'] = pjoin(os.getcwd(), '..', 'interfaces', 'python') + ':/usr/netpub/numpy/numpy-1.6.2/lib/python2.7/site-packages' os.environ['PYTHONPATH'] = pjoin(os.getcwd(), '..', 'interfaces', 'python')
os.environ['CANTERA_DATA'] = pjoin(os.getcwd(), '..', 'build', 'data') os.environ['CANTERA_DATA'] = pjoin(os.getcwd(), '..', 'build', 'data')