diff options
| author | Dan Albert <danalbert@google.com> | 2015-04-14 23:49:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-14 23:49:11 +0000 |
| commit | 4325b239b22e56200a53719b28e0207c00240acc (patch) | |
| tree | 482067f3a38a317c9fcedb2502c8a71c3ae077cb | |
| parent | 5d7b6dffa41dffb6e80e91041bbd4e8fd759c4a1 (diff) | |
| parent | 3a29e8f9d37a95e5154af33d159918e624def323 (diff) | |
| download | external_libcxx-4325b239b22e56200a53719b28e0207c00240acc.tar.gz external_libcxx-4325b239b22e56200a53719b28e0207c00240acc.tar.bz2 external_libcxx-4325b239b22e56200a53719b28e0207c00240acc.zip | |
am 3a29e8f9: Merge "Fix output directory for host tests."
* commit '3a29e8f9d37a95e5154af33d159918e624def323':
Fix output directory for host tests.
| -rw-r--r-- | test/libcxx/android/test/config.py | 9 | ||||
| -rw-r--r-- | test/lit.site.cfg | 1 |
2 files changed, 8 insertions, 2 deletions
diff --git a/test/libcxx/android/test/config.py b/test/libcxx/android/test/config.py index c16294302..bff0c4597 100644 --- a/test/libcxx/android/test/config.py +++ b/test/libcxx/android/test/config.py @@ -14,9 +14,9 @@ class Configuration(libcxx.test.config.Configuration): def configure(self): self.configure_src_root() + self.configure_build_cmds() self.configure_obj_root() - self.configure_build_cmds() self.configure_cxx() self.configure_triple() self.configure_features() @@ -31,6 +31,13 @@ class Configuration(libcxx.test.config.Configuration): self.lit_config.note('Using available_features: %s' % list(self.config.available_features)) + def configure_obj_root(self): + test_config_file = os.path.join(self.build_cmds_dir, 'testconfig.mk') + if 'HOST_NATIVE_TEST' in open(test_config_file).read(): + self.libcxx_obj_root = os.getenv('ANDROID_HOST_OUT') + else: + self.libcxx_obj_root = os.getenv('ANDROID_PRODUCT_OUT') + def configure_build_cmds(self): os.chdir(self.config.android_root) self.build_cmds_dir = os.path.join(self.libcxx_src_root, 'buildcmds') diff --git a/test/lit.site.cfg b/test/lit.site.cfg index c5c929b9c..c9dbdfb51 100644 --- a/test/lit.site.cfg +++ b/test/lit.site.cfg @@ -3,7 +3,6 @@ import os config.configuration_variant = 'libcxx.android' config.android_root = os.getenv('ANDROID_BUILD_TOP') config.libcxx_src_root = os.path.join(config.android_root, 'external/libcxx') -config.libcxx_obj_root = os.getenv('ANDROID_PRODUCT_OUT') config.python_executable = '/usr/bin/python' config.timeout = '300' |