From 94b4c52bf50ddd80a171de5768520314c1b9d34c Mon Sep 17 00:00:00 2001 From: Rintaro Kuroiwa Date: Sat, 26 Mar 2016 16:40:13 -0700 Subject: [PATCH] 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 --- packager/app/test/packager_app.py | 2 +- packager/app/test/test_env.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packager/app/test/packager_app.py b/packager/app/test/packager_app.py index 26ffe0a73b..43306a747f 100644 --- a/packager/app/test/packager_app.py +++ b/packager/app/test/packager_app.py @@ -19,7 +19,7 @@ class PackagerApp(object): """Main integration class for testing the packager binary.""" 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) self.binary = os.path.join(self.build_dir, 'packager') diff --git a/packager/app/test/test_env.py b/packager/app/test/test_env.py index dfd9a2961e..bc4f86e715 100644 --- a/packager/app/test/test_env.py +++ b/packager/app/test/test_env.py @@ -21,7 +21,7 @@ import sys # Define static global objects and attributes. 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. parser = argparse.ArgumentParser()