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

Deprecated Config.exiv2_ext

Browse Source
This commit is contained in:
LeoHsiao 2020-09-06 13:11:20 +08:00
parent 65a0ab1827
commit 63b074d690
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/bash_tests/utils.py
View File

@ -21,7 +21,6 @@ class Config:
# The configuration parameters for bash test
# 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__), '../../../'))
exiv2_ext = '' # or '.exe'
bin_dir = os.path.join(exiv2_dir, 'build/bin')
data_dir = os.path.join(exiv2_dir, 'test/data')
tmp_dir = os.path.join(exiv2_dir, 'test/tmp')
@ -369,7 +368,7 @@ def execute(cmd: str,
cmd = cmd.format(**vars_dict)
args = cmd.split(' ', maxsplit=1)
if args[0] in Config.bin_files:
args[0] = os.path.join(Config.bin_dir, args[0]) + Config.exiv2_ext
args[0] = os.path.join(Config.bin_dir, args[0])
args = ' '.join(args)
if Config.system_name == 'Windows':
args = args.replace('\'', '\"')

1
tests/system_tests.py
View File

@ -208,7 +208,6 @@ def configure_suite(config_file):
BT.Config.bin_dir = os.path.abspath(config['ENV']['exiv2_path'])
BT.Config.data_dir = os.path.abspath(config['paths']['data_path'])
BT.Config.tmp_dir = os.path.abspath(config['paths']['tmp_path'])
BT.Config.exiv2_ext = config['ENV']['binary_extension']
BT.Config.exiv2_http = config['ENV']['exiv2_http']
BT.Config.exiv2_port = int(config['ENV']['exiv2_port'])
# print(dict(config['ENV'])); exit(1) # for debug