LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update create_test to new android_mk API.

Browse Source 
Change-Id: I5b95cbee02051e3e347e68f874863a7b56e2df8b
This commit is contained in:
Brett Chabot
2012-01-17 15:54:39 -08:00
parent 7eef71a24c
commit a39865a1cb
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
testrunner/create_test.py
View File

@@ -121,20 +121,21 @@ def _GenerateTestManifest(manifest, module_name, mapping=None):
_PrintMessage("Created %s" % tests_manifest_path) _PrintMessage("Created %s" % tests_manifest_path)
def _GenerateTestMK(mk, mapping=None): def _GenerateTestMK(mk, app_path, mapping=None):
"""Create and populate tests/Android.mk with variable values from Android.mk. """Create and populate tests/Android.mk with variable values from Android.mk.
Does nothing if tests/Android.mk already exists. Does nothing if tests/Android.mk already exists.
Args: Args:
mk: AndroidMK object for application makefile mk: AndroidMK object for application makefile
app_path: path to the application being tested
mapping: optional user defined mapping of variable values, replaces mapping: optional user defined mapping of variable values, replaces
values stored in mk values stored in mk
Raises: Raises:
IOError: tests/Android.mk cannot be opened for writing IOError: tests/Android.mk cannot be opened for writing
""" """
# skip if file already exists # skip if file already exists
tests_path = "%s/%s" % (mk.app_path, TestsConsts.TESTS_FOLDER) tests_path = "%s/%s" % (app_path, TestsConsts.TESTS_FOLDER)
tests_mk_path = "%s/%s" % (tests_path, mk.FILENAME) tests_mk_path = "%s/%s" % (tests_path, mk.FILENAME)
if os.path.exists(tests_mk_path): if os.path.exists(tests_mk_path):
_PrintMessage("%s already exists, not overwritten" % tests_mk_path) _PrintMessage("%s already exists, not overwritten" % tests_mk_path)
@@ -142,7 +143,7 @@ def _GenerateTestMK(mk, mapping=None):
# append test build if not existent in makefile # append test build if not existent in makefile
if not mk.HasInclude(TestsConsts.MK_BUILD_INCLUDE): if not mk.HasInclude(TestsConsts.MK_BUILD_INCLUDE):
mk_path = "%s/%s" % (mk.app_path, mk.FILENAME) mk_path = "%s/%s" % (app_path, mk.FILENAME)
mk_file = open(mk_path, mode="a") mk_file = open(mk_path, mode="a")
mk_file.write(TestsConsts.MK_BUILD_STRING) mk_file.write(TestsConsts.MK_BUILD_STRING)
mk_file.close() mk_file.close()
@@ -224,12 +225,12 @@ def main(argv):
sys.exit() sys.exit()
try: try:
mk = android_mk.AndroidMK(app_path=app_path) mk = android_mk.CreateAndroidMK(path=app_path)
manifest = android_manifest.AndroidManifest(app_path=app_path) manifest = android_manifest.AndroidManifest(app_path=app_path)
_ValidateInputFiles(mk, manifest) _ValidateInputFiles(mk, manifest)
module_name = mk.GetVariable(mk.PACKAGE_NAME) module_name = mk.GetVariable(mk.PACKAGE_NAME)
_GenerateTestMK(mk) _GenerateTestMK(mk, app_path)
_GenerateTestManifest(manifest, module_name) _GenerateTestManifest(manifest, module_name)
except Exception, e: except Exception, e:
_PrintError("Error: %s" % e) _PrintError("Error: %s" % e)