third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding support for VALGRIND and EXIV2_BINDIR

Browse Source
This commit is contained in:
clanmills 2020-10-23 17:30:56 +01:00
parent 43698f414b
commit 985617cdfc
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/bash_tests/utils.py
View File

@ -23,6 +23,8 @@ class Config:
# When you run the test cases through `python3 runner.py`, the function configure_suite() in system_tests.py will override these parameters.
exiv2_dir = os.path.normpath(os.path.join(os.path.abspath(__file__), '../../../'))
bin_dir = os.path.join(exiv2_dir, 'build/bin')
if 'EXIV2_BINDIR' in os.environ:
bin_dir = os.environ['EXIV2_BINDIR']
dyld_library_path = os.path.join(bin_dir, '../lib')
ld_library_path = os.path.join(bin_dir, '../lib')
data_dir = os.path.join(exiv2_dir, 'test/data')
@ -30,13 +32,13 @@ class Config:
system_name = platform.system() or 'Unknown' # It could be Windows, Linux, etc.
exiv2_http = 'http://127.0.0.1'
exiv2_port = '12760'
exiv2_echo = ''
verbose = ''
valgrind = ''
if 'EXIV2_PORT' in os.environ:
exiv2_port = os.environ['EXIV2_PORT']
if 'EXIV2_HTTP' in os.environ:
exiv2_http = os.environ['EXIV2_HTTP']
if 'VALGRIND' in os.environ:
valgrind = os.environ['VALGRIND']
@classmethod
def init(cls):
@ -455,6 +457,9 @@ class Executer:
self.args = args.replace('\'', '\"')
else:
self.args = shlex.split(args, posix=os.name == 'posix')
if len(Config.valgrind)>0:
self.args = [ Config.valgrind ] + self.args
# Check stdin
if self.stdin:
@ -464,10 +469,6 @@ class Executer:
self.run()
def run(self):
# Whether to display the command to execute
if Config.exiv2_echo:
print('++', ' '.join(self.args))
# Check stdout
if self.redirect_stderr_to_stdout:
stderr = subprocess.STDOUT