Fix path for benchmark resources on golem
The extraction will simply dump the tarball to the root benchmarks/BENCHMARK_NAME dir
Bug: b/173189095
Change-Id: I6a823e2ad76e57f6a054a4660a0d2e225be847d2
diff --git a/tools/run_on_app_dump.py b/tools/run_on_app_dump.py
index 9e729fe..6c17c1e 100755
--- a/tools/run_on_app_dump.py
+++ b/tools/run_on_app_dump.py
@@ -503,10 +503,12 @@
def get_results_for_app(app, options, temp_dir):
app_folder = app.folder if app.folder else app.name + "_" + app.revision
+ # Golem extraction will extract to the basename under the benchmarks dir.
+ app_location = os.path.basename(app_folder) if options.golem else app_folder
opensource_basedir = (os.path.join('benchmarks', app.name) if options.golem
else utils.OPENSOURCE_DUMPS_DIR)
- app_dir = (os.path.join(utils.INTERNAL_DUMPS_DIR, app_folder) if app.internal
- else os.path.join(opensource_basedir, app_folder))
+ app_dir = (os.path.join(utils.INTERNAL_DUMPS_DIR, app_location) if app.internal
+ else os.path.join(opensource_basedir, app_location))
if not os.path.exists(app_dir) and not options.golem:
# Download the app from google storage.
download_sha(app_dir + ".tar.gz.sha1", app.internal)
