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:
3
run-tests.py
Normal file → Executable file
3
run-tests.py
Normal file → Executable file
@@ -1,3 +1,4 @@
|
|||||||
|
#!/usr/bin/env python
|
||||||
#
|
#
|
||||||
# Copyright (C) 2015 The Android Open Source Project
|
# Copyright (C) 2015 The Android Open Source Project
|
||||||
#
|
#
|
||||||
@@ -79,7 +80,7 @@ def mmm(path):
|
|||||||
|
|
||||||
def gen_build_cmds(bitness, compiler, host):
|
def gen_build_cmds(bitness, compiler, host):
|
||||||
gen_test_config(bitness, compiler, host)
|
gen_test_config(bitness, compiler, host)
|
||||||
mmm(os.path.join(THIS_DIR, 'buildcmds'))
|
mmm('external/libcxx/buildcmds')
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ class Configuration(libcxx.test.config.Configuration):
|
|||||||
|
|
||||||
def configure_build_cmds(self):
|
def configure_build_cmds(self):
|
||||||
os.chdir(self.config.android_root)
|
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,
|
if not libcxx.android.build.mm(self.build_cmds_dir,
|
||||||
self.config.android_root):
|
self.config.android_root):
|
||||||
raise RuntimeError('Could not generate build commands.')
|
raise RuntimeError('Could not generate build commands.')
|
||||||
|
|||||||
Reference in New Issue
Block a user