diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2020-01-17 07:18:18 -0500 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2020-01-22 00:23:07 -0500 |
| commit | 3c2ab5593bd3b75e0a13f6e9826606a640b46fe0 (patch) | |
| tree | b68c13d7470662538781493461adaebe4bf3ac47 /tests | |
| parent | 3a61c8db9d25ff8ed08c5f96acecd63707187904 (diff) | |
| download | qemu-3c2ab5593bd3b75e0a13f6e9826606a640b46fe0.zip qemu-3c2ab5593bd3b75e0a13f6e9826606a640b46fe0.tar.gz qemu-3c2ab5593bd3b75e0a13f6e9826606a640b46fe0.tar.bz2 | |
bios-tables-test: document expected file update
Document the flow for the case where contributor
updates the expected files.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/qtest/bios-tables-test.c | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index f1ac2d7..3ab4872 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -16,7 +16,10 @@ * 1. add empty files for new tables, if any, under tests/data/acpi * 2. list any changed files in tests/bios-tables-test-allowed-diff.h * 3. commit the above *before* making changes that affect the tables - * Maintainer: + * + * Contributor or ACPI Maintainer (steps 4-7 need to be redone to resolve conflicts + * in binary commit created in step 6): + * * After 1-3 above tests will pass but ignore differences with the expected files. * You will also notice that tests/bios-tables-test-allowed-diff.h lists * a bunch of files. This is your hint that you need to do the below: @@ -28,13 +31,23 @@ * output. If not - disassemble them yourself in any way you like. * Look at the differences - make sure they make sense and match what the * changes you are merging are supposed to do. + * Save the changes, preferably in form of ASL diff for the commit log in + * step 6. * * 5. From build directory, run: * $(SRC_PATH)/tests/data/acpi/rebuild-expected-aml.sh - * 6. Now commit any changes. - * 7. Before doing a pull request, make sure tests/bios-tables-test-allowed-diff.h - * is empty - this will ensure following changes to ACPI tables will - * be noticed. + * 6. Now commit any changes to the expected binary, include diff from step 4 + * in commit log. + * 7. Before sending patches to the list (Contributor) + * or before doing a pull request (Maintainer), make sure + * tests/bios-tables-test-allowed-diff.h is empty - this will ensure + * following changes to ACPI tables will be noticed. + * + * The resulting patchset/pull request then looks like this: + * - patch 1: list changed files in tests/bios-tables-test-allowed-diff.h. + * - patches 2 - n: real changes, may contain multiple patches. + * - patch n + 1: update golden master binaries and empty + * tests/bios-tables-test-allowed-diff.h */ #include "qemu/osdep.h" |