Mirror-Tools
/
shaka-packager
mirror of https://github.com/shaka-project/shaka-packager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add -v and --vmodule flags in test script 

The flags will be propagated to packager binary if set.

Change-Id: I38aa9f4fb8e23f7a802d4114b5507035ef0cc583
This commit is contained in:
KongQun Yang 2017-04-25 12:29:28 -07:00
parent baf28815f5
commit 4d81979b16
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packager/app/test/packager_app.py
View File

@ -37,11 +37,18 @@ class PackagerApp(object):
return subprocess.check_output([self.binary, '--version']) return subprocess.check_output([self.binary, '--version'])
def Package(self, streams, flags=None): def Package(self, streams, flags=None):
"""Executes packager command."""
if flags is None: if flags is None:
flags = [] flags = []
cmd = [self.binary] cmd = [self.binary]
cmd.extend(streams) cmd.extend(streams)
cmd.extend(flags) cmd.extend(flags)
if test_env.options.v:
cmd.extend(['--v=%s' % test_env.options.v])
if test_env.options.vmodule:
cmd.extend(['--vmodule="%s"' % test_env.options.vmodule])
# Put single-quotes around each entry so that things like '$' signs in # Put single-quotes around each entry so that things like '$' signs in
# segment templates won't be interpreted as shell variables. # segment templates won't be interpreted as shell variables.
self.packaging_command_line = ' '.join(["'%s'" % entry for entry in cmd]) self.packaging_command_line = ' '.join(["'%s'" % entry for entry in cmd])

2
packager/app/test/test_env.py
View File

@ -27,6 +27,8 @@ SRC_DIR = os.path.join(SCRIPT_DIR, os.pardir, os.pardir)
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument('--test_update_golden_files', default=0, type=int) parser.add_argument('--test_update_golden_files', default=0, type=int)
parser.add_argument('--v')
parser.add_argument('--vmodule')
# Overwrite the test to encryption key/iv specified in the command line. # Overwrite the test to encryption key/iv specified in the command line.
parser.add_argument('--encryption_key') parser.add_argument('--encryption_key')
parser.add_argument('--encryption_iv') parser.add_argument('--encryption_iv')