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

packager test should respect builddir_name 

- Use 'builddir_name' environment variable to create the output
  path in test_env.py
- This allows running the packager test with different build
  configs because it doesn't use 'out', e.g. it could use 'out_clang'
  for clang builds.

Change-Id: I843343ec8e2d0a64dffbab2fdbd38aead5c97718
This commit is contained in:
Rintaro Kuroiwa 2016-03-26 16:40:13 -07:00
parent 0c46943177
commit 94b4c52bf5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,7 @@ class PackagerApp(object):
"""Main integration class for testing the packager binary.""" """Main integration class for testing the packager binary."""
def __init__(self): def __init__(self):
self.build_dir = os.path.join(test_env.SRC_DIR, 'out', self.build_dir = os.path.join(test_env.OUT_DIR,
test_env.options.build_type) test_env.options.build_type)
self.binary = os.path.join(self.build_dir, 'packager') self.binary = os.path.join(self.build_dir, 'packager')

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

@ -21,7 +21,7 @@ import sys
# Define static global objects and attributes. # Define static global objects and attributes.
SRC_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), '../../..') SRC_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), '../../..')
OUT_DIR = os.path.join(SRC_DIR, os.getenv('builddir_name', 'out'))
# Parse arguments and calculate dynamic global objects and attributes. # Parse arguments and calculate dynamic global objects and attributes.
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()