Commit Graph

4405 Commits

Author SHA1 Message Date
Zoe Tsou
b4dbd9c24e Merge "Add constant.py." into main am: 8ca4239aed
Original change: https://android-review.googlesource.com/c/platform/development/+/2755986

Change-Id: I1779c0cac1df730692fcafb26e9b6d5245ee873d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 12:23:41 +00:00
Zoe Tsou
8ca4239aed Merge "Add constant.py." into main 2023-09-19 11:44:51 +00:00
Zoe Tsou
a80614615e Merge "Add unit tests for tools/compare_cts_reports." into main am: 2b53c7eb2e
Original change: https://android-review.googlesource.com/c/platform/development/+/2749842

Change-Id: Iec372a821b9f849120d912d409a7e594f64b1c6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 07:58:35 +00:00
Zoe Tsou
2b53c7eb2e Merge "Add unit tests for tools/compare_cts_reports." into main 2023-09-19 07:26:21 +00:00
Zoe Tsou
52b17faace Add constant.py.
Bug: 292453652
Test: ./parse_cts_report.py -r REPORT -d OUTPUT_DIR &&
  ./aggregate_cts_reports.py -r REPORT [REPORT ...] -d OUTPUT_DIR &&
  ./compare_cts_reports.py [-r CTS_REPORTS [CTS_REPORTS ...]] \
  [--folder CTS_REPORTS] --mode {1,2,n} --output-dir OUTPUT_DIR [--csv CSV] [--output-files]
Change-Id: I96a135feb84b8f5e4dad939500865a65c000351d
2023-09-19 07:24:36 +00:00
Zoe Tsou
83445923e5 Add unit tests for tools/compare_cts_reports.
Bug: 293809772
Test: ./test_parse_cts_report.py
Test: ./test_aggregate_cts_reports.py
Change-Id: I813482cfdfdcc9a5f2384f95fd289fb7ff89619f
2023-09-15 07:42:10 +00:00
Zoe Tsou
26b723d39c Merge "Implement folder input." into main am: ad5a7859c8
Original change: https://android-review.googlesource.com/c/platform/development/+/2738614

Change-Id: I8a64bfb9b143e315a3ca6773f4c04ac81550b7cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 10:03:51 +00:00
Zoe Tsou
ad5a7859c8 Merge "Implement folder input." into main 2023-09-07 09:24:59 +00:00
Zoe Tsou
e07b08ce7f Implement folder input.
One flag '-f' corresponds to one directory that stores a parsed report.

Bug: 296988808
Test: ./compare_cts_reports.py -r test_result_1.xml [test_result_2.xml] \
    [-r report.zip] [-f parsed_dir_1/] [-f parsed_dir_2/] -m n -d output_dir/
Change-Id: I26310982dc8ef18f5dbfb1a8382ea3a600508fbe
2023-09-07 03:25:58 +00:00
Treehugger Robot
d42c9deb5e Merge "device_supported is true by default, no need to specify it." into main am: 1c8730d71c
Original change: https://android-review.googlesource.com/c/platform/development/+/2743415

Change-Id: I816a34d23e56ca2fc55f24e65876297cb5eec764
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 19:00:00 +00:00
Treehugger Robot
37cc5e155c Merge "Default device_supported and host_supported to true in serde." into main am: 210030f1af
Original change: https://android-review.googlesource.com/c/platform/development/+/2743414

Change-Id: I7d0f1e26c0bf12769b8221dfa206e611f97ee141
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 18:59:30 +00:00
Andrew Walbran
a8ccd6f364 device_supported is true by default, no need to specify it.
Bug: 293289578
Test: atest cargo_embargo.test
Change-Id: I54b6586b4b5940d0e94a2a8f4b35c267792c4842
2023-09-06 16:15:54 +01:00
Andrew Walbran
2e6cec5a0f Default device_supported and host_supported to true in serde.
This is cleaner than using .unwrap_or(true) wherever they are used.

Bug: 293289578
Test: atest cargo_embargo.test
Change-Id: I763adf0cc51721408adf55b966ed4304e2766c00
2023-09-06 16:11:21 +01:00
Xin Li
c48ca52981 Merge Android U (ab/10368041)
Bug: 291102124
Merged-In: I3ecaaa93a89703a6c3d20c81210f7c6683c145fb
Change-Id: Ib5819377b7aad20e03ca639b4e65172fefe0b512
2023-08-25 13:42:52 -07:00
Zoe Tsou
718ef28b58 Merge "Implement N way comparison." into main 2023-08-25 08:44:47 +00:00
Zoe Tsou
48f8bf931f Implement N way comparison.
The attributes tested_items and pass_rate are added for easier display in the
n_way_comparison function.

Bug: 296988808
Test: ./compare_cts_reports.py -r test_result_1.xml -r test_result_2.xml -m n \
      -d output_dir
Change-Id: I1dc6bb9c33dfe5be879cbdc13f684bde123e5e71
2023-08-25 07:41:01 +00:00
Treehugger Robot
8df3496e01 Merge "Move logic for detecting different kinds of externs to cargo_out." into main 2023-08-23 11:35:00 +00:00
Treehugger Robot
e1c97bd7e9 Merge changes I5a2e2871,I53b1f37e,I693ea16a into main
* changes:
  Split cargo_out into three modules.
  Factor out functions to find package directory.
  Add more doc comments and break up parse_cargo_out function.
2023-08-23 11:07:41 +00:00
Zoe Tsou
9ea1b08298 Compare two cts reports.
Assumptions:
    1. The input report file can be a zip file result from a standard cts
       test tool, or a test_result.xml
    2. If there are multiple cts reports after the -r flag, it means to view
       these files as one report. The script aggregates them according to the
       same rules as b/293809772.

Bug: 296323842
Test: ./compare_cts_reports.py -r [a.zip, test_result_1.xml] -r [b.zip,
      test_result_2.xml] -m [1, 2] [-d output_directory] [-o]
Change-Id: I885dd07cd40d38ba0c2ee1cb38570a926606a4d9
2023-08-22 05:08:45 +00:00
Andrew Walbran
9454b29450 Move logic for detecting different kinds of externs to cargo_out.
This will work differently when not running cargo.

Bug: 293289578
Test: atest cargo_embargo.test
Change-Id: I6c7b1f6266d7d66bcbb68387d06f59306695008e
2023-08-16 16:27:25 +01:00
Andrew Walbran
085fa6c6b1 Split cargo_out into three modules.
The `cargo` module has the output types, `cargo_out` has the code
specific to parsing cargo.out files, while `metadata` has the types to
parse cargo.metadata files.

Bug: 293289578
Test: atest cargo_embargo.test
Change-Id: I5a2e2871a48bf30a64f3ffbc84a160b0daa91b53
2023-08-16 12:54:20 +01:00
Andrew Walbran
6cf047b9ed Factor out functions to find package directory.
Bug: 293289578
Test: atest cargo_embargo.test
Change-Id: I53b1f37ed1a9cd171c373c7fb4effda94f887437
2023-08-16 10:34:29 +01:00
Andrew Walbran
a1468cca18 Add more doc comments and break up parse_cargo_out function.
This is a step towards making it testable.

Bug: 293289578
Test: atest cargo_embargo.test
Change-Id: I693ea16adf82f73c73a93e8dfa5ed4f351760828
2023-08-16 10:34:29 +01:00
Treehugger Robot
e64a580e9f Merge "Make tests configuration option optional." into main 2023-08-15 18:52:25 +00:00
Treehugger Robot
4266276d42 Merge "Add test for generating Android.bp from list of crates." into main 2023-08-15 18:51:45 +00:00
Treehugger Robot
3c9af85e16 Merge "Remove emit_list." into main 2023-08-15 18:36:13 +00:00
Andrew Walbran
8e86dfe14e Make tests configuration option optional.
Bug: 293289578
Test: atest cargo_embargo.test
Change-Id: Ia35acdcad920e0f585cc5be650f1d1e3b6aa176d
2023-08-15 17:47:06 +01:00
Andrew Walbran
3da057735e Add test for generating Android.bp from list of crates.
Bug: 293289578
Test: atest cargo_embargo.test
Change-Id: I2be01cee617913d429ceb5f41f81126d38301ede
2023-08-15 17:47:06 +01:00
Andrew Walbran
2a4c28bf67 Remove emit_list.
It's not used anywhere.

Bug: 293289578
Test: atest cargo_embargo.test
Change-Id: I8ab1cbec7fe05997c9b24a8e0b658c092a6046ae
2023-08-15 16:54:00 +01:00
Zoe Tsou
c864e8880b The script parse_cts_report.py converts single cts report into \
three files:
    info.json
    result.csv
    summary.csv

The class Report() is implemented so that parse_cts_report.py \
can be easily used by another script aggregate_reports.py.

The script aggregate_reports.py converts multiple cts reports into \
three files:
    info.json
    result.csv
    summary.csv

Assumptions:
    1. If the input is a zip file, the struture should be
        abc.zip
        |----abc/
        |    |----test_result.xml
    2. The input file and the output directory must have existed.

Bug: 293809772
Test: `./parse_cts_report.py --report-file [a.zip, test_result.xml] \
    -d output_directory`
Test: `./aggregate_reports.py --report-files a.zip b.zip -d \
    output_directory`
Change-Id: I8e5481ecc1ebf7f370debb59cb3c065cf9edcfad
2023-08-15 08:42:03 +00:00
Zoe Tsou
0a48327c6c Merge "Convert single cts report into three files: info.json result.csv summary.csv" into main 2023-08-09 07:21:44 +00:00
Zoe Tsou
82deafccbf Convert single cts report into three files:
info.json
    result.csv
    summary.csv

Assumptions:
    1. If the input is a zip file, the struture should be
        abc.zip
        |----abc/
        |    |----test_result.xml
    2. The input file and the output directory must have existed.

Bug: 293809772
Test: ./parse_cts_report.py --report-file [a.zip, test_result.xml] \
    -d output_directory
Change-Id: I19dabdaed02408b7bf4a030394b99ed42925aa55
2023-08-09 05:48:40 +00:00
Andrew Walbran
0277236ce5 Add tests for crate_to_bp_modules.
Bug: 293289578
Test: atest cargo_embargo.test
Change-Id: I9063a2dffea3a716224a1bd6a722e408b5eb0494
2023-08-04 18:02:21 +01:00
Zoe Tsou
4c2345a3c3 Merge "migrated the script from python2 to python3." into main 2023-08-02 08:08:40 +00:00
Matthias Männich
b417397c18 Merge "ndkabidump: switch to .stg format" into main 2023-08-01 21:36:36 +00:00
Matthias Maennich
273a2c88ee ndkabidump: switch to .stg format
Bug: 156513478
Change-Id: I1250aca298894851039b058f286b21d4c1f46716
Signed-off-by: Matthias Maennich <maennich@google.com>
2023-08-01 17:23:22 +00:00
Andrew Walbran
a314f8e3fd Split out JSON configuration reading to a separate module.
Bug: 293289578
Test: m cargo_embargo
Change-Id: I993da0c666a2dd90fa46f697553b9778e1e3ad37
2023-08-01 16:00:29 +01:00
Zoe Tsou
2baeec3a8e migrated the script from python2 to python3.
Bug: 292454054
Test: 'python3 compare_failed_tests.py test_result_a.xml
test_result_b.xml'

Change-Id: I84c5a1523c80a7672492f6c6487982ae777eef28
2023-07-31 03:35:51 +00:00
Andrew Walbran
8b488a9338 Add support for product_available and vendor_available flags.
Bug: 293289578
Test: Ran on external/rust/crates/either
Change-Id: Iaf357dc2a9e036689c07005f2f9ca3879e3e71ee
2023-07-28 11:10:59 +01:00
Pablo Gamito
43aebe6d17 Show noop transactions in viewer am: 89570faf2c
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/23631337

Change-Id: Ic10c3ef0d7421fa9664d6d234310d57982b09ff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 14:18:31 +00:00
Pablo Gamito
e4bf92d82f Add transaction ids to viewer and a filter for them am: 166b11bcb5
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/23602064

Change-Id: I409a3f4e5a357bac33777bfb796fc0f34e34c337
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 14:18:28 +00:00
Pablo Gamito
89570faf2c Show noop transactions in viewer
Fixes: 286517142
Test: npm run test:all
Change-Id: I8e33f72f0ae35c232f3efc251c5371f8951e9482
2023-06-09 12:54:29 +00:00
Pablo Gamito
166b11bcb5 Add transaction ids to viewer and a filter for them
Fixes: 284264724
Test: npm run test:all
Change-Id: I8e33f72f0ae35c232f3efc251c5371f895112345
2023-06-09 12:54:29 +00:00
Treehugger Robot
8247a6ed39 Merge "Apply riscv64 workarounds." am: fc9eaf5daa am: aec7fe8e92 am: 219c85ab47
Original change: https://android-review.googlesource.com/c/platform/development/+/2618389

Change-Id: I277b5e61d6007a6158c10b91597ce2cac2832010
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 03:15:42 +00:00
Treehugger Robot
aec7fe8e92 Merge "Apply riscv64 workarounds." am: fc9eaf5daa
Original change: https://android-review.googlesource.com/c/platform/development/+/2618389

Change-Id: I1978e31b867595760d15ea36fa588aae5d965c72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 01:46:26 +00:00
Dan Albert
cc5dad70f8 Apply riscv64 workarounds.
These were needed in build-ndk-prebuilts.sh too. Copy them here.

Bug: None
Test: ./update_ndk_abi.sh
Change-Id: Ia6263ff1b0936aa3a80747042662df24ddfb88e0
2023-06-06 23:39:55 +00:00
Kean Mariotti
2b30f33150 Merge changes Ieddaf47c,Ia96c58d5,I89e03fff into udc-dev am: 09a1c31019
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/23489996

Change-Id: I525c14df638a20580fd2d2f0afb1c7192ef2430a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 19:13:46 +00:00
Kean Mariotti
09a1c31019 Merge changes Ieddaf47c,Ia96c58d5,I89e03fff into udc-dev
* changes:
  Add 'npm run test:presubmit' script
  Change displayed trace descriptors
  Optimize bugreport loading
2023-06-02 18:00:48 +00:00
Treehugger Robot
d189471c78 Merge "Add CUJ trace parser to Winscope" into udc-dev am: aaa8dcd1f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/23515819

Change-Id: I1b4bf62a75fa97a704bcb5658f859b20e63549a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 13:11:38 +00:00
Treehugger Robot
aaa8dcd1f7 Merge "Add CUJ trace parser to Winscope" into udc-dev 2023-06-02 12:26:57 +00:00