[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 09/17] bios-tables-test: document expected file update
From: |
Michael S. Tsirkin |
Subject: |
[PULL v2 09/17] bios-tables-test: document expected file update |
Date: |
Wed, 22 Jan 2020 01:50:14 -0500 |
Document the flow for the case where contributor
updates the expected files.
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
tests/qtest/bios-tables-test.c | 23 ++++++++++++++++++-----
1 file changed, 18 insertions(+), 5 deletions(-)
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index f1ac2d7e96..3ab4872bd7 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"
--
MST
- [PULL v2 00/17] virtio, pc: fixes, features, Michael S. Tsirkin, 2020/01/22
- [PULL v2 01/17] q35: implement 128K SMRAM at default SMBASE address, Michael S. Tsirkin, 2020/01/22
- [PULL v2 02/17] tests: q35: MCH: add default SMBASE SMRAM lock test, Michael S. Tsirkin, 2020/01/22
- [PULL v2 03/17] acpi: cpuhp: spec: clarify 'CPU selector' register usage and endianness, Michael S. Tsirkin, 2020/01/22
- [PULL v2 04/17] acpi: cpuhp: spec: fix 'Command data' description, Michael S. Tsirkin, 2020/01/22
- [PULL v2 05/17] acpi: cpuhp: spec: clarify store into 'Command data' when 'Command field' == 0, Michael S. Tsirkin, 2020/01/22
- [PULL v2 06/17] acpi: cpuhp: introduce 'Command data 2' field, Michael S. Tsirkin, 2020/01/22
- [PULL v2 07/17] acpi: cpuhp: spec: add typical usecases, Michael S. Tsirkin, 2020/01/22
- [PULL v2 08/17] acpi: cpuhp: add CPHP_GET_CPU_ID_CMD command, Michael S. Tsirkin, 2020/01/22
- [PULL v2 09/17] bios-tables-test: document expected file update,
Michael S. Tsirkin <=
- [PULL v2 10/17] virtio-9p-device: fix memleak in virtio_9p_device_unrealize, Michael S. Tsirkin, 2020/01/22
- [PULL v2 12/17] virtio-scsi: delete vqs in unrealize to avoid memleaks, Michael S. Tsirkin, 2020/01/22
- [PULL v2 11/17] virtio-9p-device: convert to new virtio_delete_queue, Michael S. Tsirkin, 2020/01/22
- [PULL v2 13/17] virtio-scsi: convert to new virtio_delete_queue, Michael S. Tsirkin, 2020/01/22
- [PULL v2 14/17] vhost-vsock: delete vqs in vhost_vsock_unrealize to avoid memleaks, Michael S. Tsirkin, 2020/01/22
- [PULL v2 15/17] vhost: Add names to section rounded warning, Michael S. Tsirkin, 2020/01/22
- [PULL v2 16/17] vhost: Only align sections for vhost-user, Michael S. Tsirkin, 2020/01/22
- [PULL v2 17/17] i386:acpi: Remove _HID from the SMBus ACPI entry, Michael S. Tsirkin, 2020/01/22
- Re: [PULL v2 00/17] virtio, pc: fixes, features, no-reply, 2020/01/22