Fix test runner to properly emulate mm/mmm.

Really weird errors get thrown with absolute paths for
`ONE_SHOT_MAKEFILE` now.

Change-Id: I10a86dfd2dab43f03bcd3ce9a8c2551decd65bc4
This commit is contained in:
Dan Albert
2016-06-09 14:25:09 -07:00
parent 75d973b27d
commit e236990ecf
2 changed files with 3 additions and 2 deletions

3
run-tests.py Normal file → Executable file
View File

@@ -1,3 +1,4 @@
#!/usr/bin/env python
#
# Copyright (C) 2015 The Android Open Source Project
#
@@ -79,7 +80,7 @@ def mmm(path):
def gen_build_cmds(bitness, compiler, host):
gen_test_config(bitness, compiler, host)
mmm(os.path.join(THIS_DIR, 'buildcmds'))
mmm('external/libcxx/buildcmds')
def main():

View File

@@ -40,7 +40,7 @@ class Configuration(libcxx.test.config.Configuration):
def configure_build_cmds(self):
os.chdir(self.config.android_root)
self.build_cmds_dir = os.path.join(self.libcxx_src_root, 'buildcmds')
self.build_cmds_dir = 'external/libcxx/buildcmds'
if not libcxx.android.build.mm(self.build_cmds_dir,
self.config.android_root):
raise RuntimeError('Could not generate build commands.')