diff options
| author | Yan Wang <yawanng@google.com> | 2020-02-19 09:43:46 -0800 |
|---|---|---|
| committer | Igor Murashkin <iam@google.com> | 2020-02-28 18:08:24 +0000 |
| commit | 6411a3353dfd1e72a33c03b0d2d99c3dc532075f (patch) | |
| tree | 4d9d06c3df83d57a94109d03c01da178d192322b /startop | |
| parent | a52f95e589f8cc9bd684561e6679ca05015c897e (diff) | |
| download | base-6411a3353dfd1e72a33c03b0d2d99c3dc532075f.tar.gz | |
startop: Fix a bug in iorap functional test.
The prefetching work runs on another process.
Grep everything to workaround it.
Bug: 137403231
Test: atest iorap-functional-tests
Change-Id: Iac1796cb22f0db83ac5ebd78cb40e5cc5ac3a930
(cherry picked from commit 7d76f014eb92661f4fb8fdb949ac000ffdce3c65)
Diffstat (limited to 'startop')
| -rw-r--r-- | startop/iorap/functional_tests/src/com/google/android/startop/iorap/IorapWorkFlowTest.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/startop/iorap/functional_tests/src/com/google/android/startop/iorap/IorapWorkFlowTest.java b/startop/iorap/functional_tests/src/com/google/android/startop/iorap/IorapWorkFlowTest.java index 40023878af19..9abbcd71cfd2 100644 --- a/startop/iorap/functional_tests/src/com/google/android/startop/iorap/IorapWorkFlowTest.java +++ b/startop/iorap/functional_tests/src/com/google/android/startop/iorap/IorapWorkFlowTest.java @@ -70,7 +70,7 @@ public class IorapWorkFlowTest { private static final Duration TIMEOUT = Duration.ofSeconds(300L); private static final String READAHEAD_INDICATOR = - "Description = /data/misc/iorapd/com.android.settings/none/com.android.settings.Settings/compiled_traces/compiled_trace.pb"; + "Description = /data/misc/iorapd/com.android.settings/-?\\d+/com.android.settings.Settings/compiled_traces/compiled_trace.pb"; private UiDevice mDevice; @@ -326,14 +326,14 @@ public class IorapWorkFlowTest { return false; } - String log = executeShellCommand("logcat -s iorapd -d"); + String log = executeShellCommand("logcat -d"); Pattern p = Pattern.compile( - ".*" + READAHEAD_INDICATOR - + ".*Total File Paths=(\\d+) \\(good: (\\d+)%\\)\n" - + ".*Total Entries=(\\d+) \\(good: (\\d+)%\\)\n" - + ".*Total Bytes=(\\d+) \\(good: (\\d+)%\\).*", - Pattern.DOTALL); + ".*" + READAHEAD_INDICATOR + + ".*Total File Paths=(\\d+) \\(good: (\\d+[.]?\\d*)%\\)\n" + + ".*Total Entries=(\\d+) \\(good: (\\d+[.]?\\d*)%\\)\n" + + ".*Total Bytes=(\\d+) \\(good: (\\d+[.]?\\d*)%\\).*", + Pattern.DOTALL); Matcher m = p.matcher(log); if (!m.matches()) { |