diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-03-04 22:24:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-04 22:24:57 +0000 |
| commit | 7ce23544b1b4ab31033415c3e7e27765113c53a2 (patch) | |
| tree | 41f8ace73d19a9ecc90fd9a07dd6df60c623726a | |
| parent | bf07c8ea5f3bd53bd156a0b41206615bd2055b25 (diff) | |
| parent | 4a63a4be71f6960297f0a25dfaa143941c53743b (diff) | |
| download | extras-simpleperf-release.tar.gz | |
Merge "Snap for 11526323 from 0c55a442adacdfc1f58e4da379296c9c982b0382 to simpleperf-release" into simpleperf-releasesimpleperf-release
| -rw-r--r-- | perf2cfg/Android.bp | 5 | ||||
| -rwxr-xr-x | perf2cfg/perf2cfg_test.py | 10 |
2 files changed, 9 insertions, 6 deletions
diff --git a/perf2cfg/Android.bp b/perf2cfg/Android.bp index e6b5505e..e3476e5a 100644 --- a/perf2cfg/Android.bp +++ b/perf2cfg/Android.bp @@ -48,4 +48,9 @@ python_test_host { test_options: { unit_test: true, }, + version: { + py3: { + embedded_launcher: true, + }, + }, } diff --git a/perf2cfg/perf2cfg_test.py b/perf2cfg/perf2cfg_test.py index 90d757f4..8989a64a 100755 --- a/perf2cfg/perf2cfg_test.py +++ b/perf2cfg/perf2cfg_test.py @@ -16,12 +16,10 @@ import unittest import os.path -def load_tests(loader, standard_tests, _pattern): - this_dir = os.path.dirname(__file__) - perf2cfg_tests = loader.discover(start_dir=os.path.join(this_dir, 'tests'), - pattern='test*.py') - standard_tests.addTests(perf2cfg_tests) - return standard_tests +from tests.test_edit import * +from tests.test_events import * +from tests.test_parse import * + if __name__ == '__main__': unittest.main(verbosity=2) |