diff options
| author | Steven Laver <lavers@google.com> | 2019-10-16 04:24:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-10-16 04:24:04 +0000 |
| commit | 2b3d780d9dcb7acee05d0c701cb2034f51cc37a7 (patch) | |
| tree | fe3a6d65d6a9c03cff46b51ef858c763cb7b91cf /startop/scripts/iorap/compiler_test.py | |
| parent | 2e1a2436016fd9b976f861f7950746cd0a688fa1 (diff) | |
| parent | b60d5e4eb4977afc7339ab5064d2977ebe385b03 (diff) | |
Merge changes from topic "RP1A.190923.001" into r-keystone-qcom-dev
* changes:
Removes now unused processCdmaCTWdpHeader.
Adds missing import for com.android.systemui.R
Remove calls to KeyguardUpdateMonitor.getInstance().
Adds back value-add that was lost when RingtonePickerActivity.java was moved.
Overload getWifiIconResource().
Revert "AudioService: simplify/document locking"
Merge RP1A.190923.001
Diffstat (limited to 'startop/scripts/iorap/compiler_test.py')
| -rw-r--r-- | startop/scripts/iorap/compiler_test.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/startop/scripts/iorap/compiler_test.py b/startop/scripts/iorap/compiler_test.py index b5d28b03a8d5..d1f11c5da2a5 100644 --- a/startop/scripts/iorap/compiler_test.py +++ b/startop/scripts/iorap/compiler_test.py @@ -30,7 +30,7 @@ See also https://docs.pytest.org/en/latest/usage.html """ import os -import compiler +import compiler_host as compiler DIR = os.path.abspath(os.path.dirname(__file__)) TEXTCACHE = os.path.join(DIR, 'test_fixtures/compiler/common_textcache') @@ -70,9 +70,9 @@ def test_compiler_main(tmpdir): # 10ms duration expected = os.path.join(DIR, 'test_fixtures/compiler/test_result_with_duration.TraceFile.pb') - assert_compile_result(output, expected, '--duration', '10') + assert_compile_result(output, expected, '--duration', '10000') # 30ms duration expected = os.path.join(DIR, 'test_fixtures/compiler/test_result_without_duration.TraceFile.pb') - assert_compile_result(output, expected, '--duration', '30') + assert_compile_result(output, expected, '--duration', '30000') |