Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(451)

Unified Diff: tools/telemetry/telemetry/core/platform/profiler/android_profiling_helper_unittest.py

Issue 554283004: Fixed path of unstripped libs in CreateSymFs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/telemetry/telemetry/core/platform/profiler/android_profiling_helper.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/telemetry/telemetry/core/platform/profiler/android_profiling_helper_unittest.py
diff --git a/tools/telemetry/telemetry/core/platform/profiler/android_profiling_helper_unittest.py b/tools/telemetry/telemetry/core/platform/profiler/android_profiling_helper_unittest.py
index 7ca185020fcf2b9cf021d320c7c4515d18408c09..6791a2f3037050b544b9da06d38ade75c9acbeb9 100644
--- a/tools/telemetry/telemetry/core/platform/profiler/android_profiling_helper_unittest.py
+++ b/tools/telemetry/telemetry/core/platform/profiler/android_profiling_helper_unittest.py
@@ -2,7 +2,6 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import glob
import os
import pickle
import re
@@ -114,18 +113,20 @@ class TestAndroidProfilingHelperTabTestCase(tab_test_case.TabTestCase):
kallsyms = android_profiling_helper.CreateSymFs(self._device, symfs_dir,
libs)
- # Make sure we found at least one unstripped library.
- unstripped_libs = glob.glob(os.path.join(symfs_dir,
- 'data', 'app-lib', '*', '*.so'))
- assert unstripped_libs
-
# Check that we have kernel symbols.
assert os.path.exists(kallsyms)
+ is_unstripped = re.compile('^/data/app/.*\.so$')
+ has_unstripped = False
+
# Check that all requested libraries are present.
for lib in libs:
+ has_unstripped = has_unstripped or is_unstripped.match(lib)
assert os.path.exists(os.path.join(symfs_dir, lib[1:])), \
'%s not found in symfs' % lib
+
+ # Make sure we found at least one unstripped library.
+ assert has_unstripped
finally:
shutil.rmtree(symfs_dir)
« no previous file with comments | « tools/telemetry/telemetry/core/platform/profiler/android_profiling_helper.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698