From 7815df59d4323bb648cfdcfb8f35f191b368ba74 Mon Sep 17 00:00:00 2001 From: Marc Bonnici Date: Wed, 12 Apr 2017 12:05:23 +0100 Subject: [PATCH] Getters: Added support for finding revent files. Revent files are automatically placed in the sub folder `revent_files` in the workload directory when recording, therefore when trying to retrieve recordings the getter now looks inside of the sub directory. --- wa/framework/getters.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/wa/framework/getters.py b/wa/framework/getters.py index 7c9986c6..777a2620 100644 --- a/wa/framework/getters.py +++ b/wa/framework/getters.py @@ -80,7 +80,16 @@ def get_from_location(basepath, resource): path = os.path.join(basepath, 'bin', resource.abi, resource.filename) if os.path.exists(path): return path - elif resource.kind in ['apk', 'jar', 'revent']: + elif resource.kind == 'revent': + path = os.path.join(basepath, 'revent_files') + if os.path.exists(path): + files = get_by_extension(path, resource.kind) + found_resource = get_generic_resource(resource, files) + if found_resource: + return found_resource + files = get_by_extension(basepath, resource.kind) + return get_generic_resource(resource, files) + elif resource.kind in ['apk', 'jar']: files = get_by_extension(basepath, resource.kind) return get_generic_resource(resource, files)