[PATCH 4/5] fwts-test: acpitables-000*: sync with recent acpitables changes

Colin King colin.king at canonical.com
Thu Apr 17 13:51:48 UTC 2014


From: Colin Ian King <colin.king at canonical.com>

fwts commits c04dbb22963f80b6e18348237b85aa6f74ac0be3 and
8bc91dc3bc1eb807bb6f26ef896c29cb0807cee4 added some improved
acpitable checking, so sync fwts-tests with the change in output
from the test.

Signed-off-by: Colin Ian King <colin.king at canonical.com>
---
 fwts-test/acpitables-0001/acpitables-0001.log | 40 +++++++++++++++++++++++++--
 fwts-test/acpitables-0002/acpitables-0001.log | 10 +++++--
 fwts-test/acpitables-0003/acpitables-0001.log | 14 +++++++---
 fwts-test/acpitables-0004/acpitables-0001.log |  8 ++++--
 fwts-test/acpitables-0005/acpitables-0001.log |  8 ++++--
 fwts-test/acpitables-0006/acpitables-0001.log |  8 ++++--
 fwts-test/acpitables-0007/acpitables-0001.log |  8 ++++--
 fwts-test/acpitables-0008/acpitables-0001.log |  7 +++--
 8 files changed, 85 insertions(+), 18 deletions(-)

diff --git a/fwts-test/acpitables-0001/acpitables-0001.log b/fwts-test/acpitables-0001/acpitables-0001.log
index 57d8813..9419c2e 100644
--- a/fwts-test/acpitables-0001/acpitables-0001.log
+++ b/fwts-test/acpitables-0001/acpitables-0001.log
@@ -1,6 +1,6 @@
 acpitables      acpitables: ACPI table settings sanity tests.
 acpitables      ----------------------------------------------------------
-acpitables      Test 1 of 1: Test ACPI tables.
+acpitables      Test 1 of 2: Test ACPI tables.
 acpitables      PASSED: Test 1, Table APIC passed.
 acpitables      Table ECDT not present to check.
 acpitables      PASSED: Test 1, Table FACP passed.
@@ -11,7 +11,43 @@ acpitables      PASSED: Test 1, Table RSDP passed.
 acpitables      Table SBST not present to check.
 acpitables      PASSED: Test 1, Table XSDT passed.
 acpitables      
+acpitables      Test 2 of 2: Test ACPI headers.
+acpitables      PASSED: Test 2, Table DSDT has valid signature and ID
+acpitables      strings.
+acpitables      PASSED: Test 2, Table FACP has valid signature and ID
+acpitables      strings.
+acpitables      PASSED: Test 2, Table APIC has valid signature and ID
+acpitables      strings.
+acpitables      PASSED: Test 2, Table HPET has valid signature and ID
+acpitables      strings.
+acpitables      PASSED: Test 2, Table MCFG has valid signature and ID
+acpitables      strings.
+acpitables      PASSED: Test 2, Table TCPA has valid signature and ID
+acpitables      strings.
+acpitables      PASSED: Test 2, Table TMOR has valid signature and ID
+acpitables      strings.
+acpitables      PASSED: Test 2, Table SLIC has valid signature and ID
+acpitables      strings.
+acpitables      PASSED: Test 2, Table APIC has valid signature and ID
+acpitables      strings.
+acpitables      PASSED: Test 2, Table BOOT has valid signature and ID
+acpitables      strings.
+acpitables      PASSED: Test 2, Table SSDT has valid signature and ID
+acpitables      strings.
+acpitables      PASSED: Test 2, Table SSDT has valid signature and ID
+acpitables      strings.
+acpitables      PASSED: Test 2, Table SSDT has valid signature and ID
+acpitables      strings.
+acpitables      PASSED: Test 2, Table SSDT has valid signature and ID
+acpitables      strings.
+acpitables      PASSED: Test 2, Table SSDT has valid signature and ID
+acpitables      strings.
+acpitables      PASSED: Test 2, Table XSDT has valid signature and ID
+acpitables      strings.
+acpitables      PASSED: Test 2, Table RSDT has valid signature and ID
+acpitables      strings.
+acpitables      
 acpitables      ==========================================================
-acpitables      7 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0
+acpitables      24 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0
 acpitables      info only.
 acpitables      ==========================================================
diff --git a/fwts-test/acpitables-0002/acpitables-0001.log b/fwts-test/acpitables-0002/acpitables-0001.log
index 8733d7b..fda4609 100644
--- a/fwts-test/acpitables-0002/acpitables-0001.log
+++ b/fwts-test/acpitables-0002/acpitables-0001.log
@@ -1,6 +1,6 @@
 acpitables      acpitables: ACPI table settings sanity tests.
 acpitables      ----------------------------------------------------------
-acpitables      Test 1 of 1: Test ACPI tables.
+acpitables      Test 1 of 2: Test ACPI tables.
 acpitables      Cannot find FACP.
 acpitables      PASSED: Test 1, Table APIC passed.
 acpitables      Table ECDT not present to check.
@@ -12,7 +12,13 @@ acpitables      Table RSDP not present to check.
 acpitables      Table SBST not present to check.
 acpitables      Table XSDT not present to check.
 acpitables      
+acpitables      Test 2 of 2: Test ACPI headers.
+acpitables      PASSED: Test 2, Table APIC has valid signature and ID
+acpitables      strings.
+acpitables      PASSED: Test 2, Table APIC has valid signature and ID
+acpitables      strings.
+acpitables      
 acpitables      ==========================================================
-acpitables      1 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0
+acpitables      3 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0
 acpitables      info only.
 acpitables      ==========================================================
diff --git a/fwts-test/acpitables-0003/acpitables-0001.log b/fwts-test/acpitables-0003/acpitables-0001.log
index 67ee411..f3cd415 100644
--- a/fwts-test/acpitables-0003/acpitables-0001.log
+++ b/fwts-test/acpitables-0003/acpitables-0001.log
@@ -1,6 +1,6 @@
 acpitables      acpitables: ACPI table settings sanity tests.
 acpitables      ----------------------------------------------------------
-acpitables      Test 1 of 1: Test ACPI tables.
+acpitables      Test 1 of 2: Test ACPI tables.
 acpitables      No FACS found, fwts has faked one instead.
 acpitables      Table APIC not present to check.
 acpitables      Table ECDT not present to check.
@@ -16,8 +16,6 @@ acpitables      which is clearly ambiguous and wrong. The kernel works
 acpitables      around this by using the 64 bit X_DSDT pointer to the
 acpitables      DSDT. 
 acpitables      
-acpitables      FAILED [MEDIUM] FADTSCIIRQZero: Test 1, FADT SCI Interrupt
-acpitables      is 0x00, should be defined.
 acpitables      FAILED [MEDIUM] FADTSMICMDZero: Test 1, FADT SMI_CMD is
 acpitables      0x00, however, one or more of ACPI_ENABLE, ACPI_DISABLE,
 acpitables      S4BIOS_REQ, PSTATE_CNT and CST_CNT are defined which means
@@ -74,7 +72,15 @@ acpitables      PASSED: Test 1, Table RSDP passed.
 acpitables      Table SBST not present to check.
 acpitables      PASSED: Test 1, Table XSDT passed.
 acpitables      
+acpitables      Test 2 of 2: Test ACPI headers.
+acpitables      PASSED: Test 2, Table FACP has valid signature and ID
+acpitables      strings.
+acpitables      PASSED: Test 2, Table RSDT has valid signature and ID
+acpitables      strings.
+acpitables      PASSED: Test 2, Table XSDT has valid signature and ID
+acpitables      strings.
+acpitables      
 acpitables      ==========================================================
-acpitables      3 passed, 8 failed, 0 warning, 0 aborted, 0 skipped, 0
+acpitables      6 passed, 7 failed, 0 warning, 0 aborted, 0 skipped, 0
 acpitables      info only.
 acpitables      ==========================================================
diff --git a/fwts-test/acpitables-0004/acpitables-0001.log b/fwts-test/acpitables-0004/acpitables-0001.log
index b51c5e2..b34c0cf 100644
--- a/fwts-test/acpitables-0004/acpitables-0001.log
+++ b/fwts-test/acpitables-0004/acpitables-0001.log
@@ -1,6 +1,6 @@
 acpitables      acpitables: ACPI table settings sanity tests.
 acpitables      ----------------------------------------------------------
-acpitables      Test 1 of 1: Test ACPI tables.
+acpitables      Test 1 of 2: Test ACPI tables.
 acpitables      Cannot find FACP.
 acpitables      Table APIC not present to check.
 acpitables      Table ECDT not present to check.
@@ -24,7 +24,11 @@ acpitables      Table RSDP not present to check.
 acpitables      Table SBST not present to check.
 acpitables      Table XSDT not present to check.
 acpitables      
+acpitables      Test 2 of 2: Test ACPI headers.
+acpitables      PASSED: Test 2, Table HPET has valid signature and ID
+acpitables      strings.
+acpitables      
 acpitables      ==========================================================
-acpitables      0 passed, 2 failed, 0 warning, 0 aborted, 0 skipped, 0
+acpitables      1 passed, 2 failed, 0 warning, 0 aborted, 0 skipped, 0
 acpitables      info only.
 acpitables      ==========================================================
diff --git a/fwts-test/acpitables-0005/acpitables-0001.log b/fwts-test/acpitables-0005/acpitables-0001.log
index 15c0384..41510e2 100644
--- a/fwts-test/acpitables-0005/acpitables-0001.log
+++ b/fwts-test/acpitables-0005/acpitables-0001.log
@@ -1,6 +1,6 @@
 acpitables      acpitables: ACPI table settings sanity tests.
 acpitables      ----------------------------------------------------------
-acpitables      Test 1 of 1: Test ACPI tables.
+acpitables      Test 1 of 2: Test ACPI tables.
 acpitables      Cannot find FACP.
 acpitables      Table APIC not present to check.
 acpitables      Table ECDT not present to check.
@@ -12,7 +12,11 @@ acpitables      Table RSDP not present to check.
 acpitables      Table SBST not present to check.
 acpitables      Table XSDT not present to check.
 acpitables      
+acpitables      Test 2 of 2: Test ACPI headers.
+acpitables      PASSED: Test 2, Table MCFG has valid signature and ID
+acpitables      strings.
+acpitables      
 acpitables      ==========================================================
-acpitables      1 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0
+acpitables      2 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0
 acpitables      info only.
 acpitables      ==========================================================
diff --git a/fwts-test/acpitables-0006/acpitables-0001.log b/fwts-test/acpitables-0006/acpitables-0001.log
index c94b6a3..cafd379 100644
--- a/fwts-test/acpitables-0006/acpitables-0001.log
+++ b/fwts-test/acpitables-0006/acpitables-0001.log
@@ -1,6 +1,6 @@
 acpitables      acpitables: ACPI table settings sanity tests.
 acpitables      ----------------------------------------------------------
-acpitables      Test 1 of 1: Test ACPI tables.
+acpitables      Test 1 of 2: Test ACPI tables.
 acpitables      Cannot find FACP.
 acpitables      Table APIC not present to check.
 acpitables      Table ECDT not present to check.
@@ -155,7 +155,11 @@ acpitables      Table RSDP not present to check.
 acpitables      Table SBST not present to check.
 acpitables      Table XSDT not present to check.
 acpitables      
+acpitables      Test 2 of 2: Test ACPI headers.
+acpitables      PASSED: Test 2, Table RSDT has valid signature and ID
+acpitables      strings.
+acpitables      
 acpitables      ==========================================================
-acpitables      0 passed, 18 failed, 0 warning, 0 aborted, 0 skipped, 0
+acpitables      1 passed, 18 failed, 0 warning, 0 aborted, 0 skipped, 0
 acpitables      info only.
 acpitables      ==========================================================
diff --git a/fwts-test/acpitables-0007/acpitables-0001.log b/fwts-test/acpitables-0007/acpitables-0001.log
index 109fd96..11fb6a4 100644
--- a/fwts-test/acpitables-0007/acpitables-0001.log
+++ b/fwts-test/acpitables-0007/acpitables-0001.log
@@ -1,6 +1,6 @@
 acpitables      acpitables: ACPI table settings sanity tests.
 acpitables      ----------------------------------------------------------
-acpitables      Test 1 of 1: Test ACPI tables.
+acpitables      Test 1 of 2: Test ACPI tables.
 acpitables      Cannot find FACP.
 acpitables      Table APIC not present to check.
 acpitables      Table ECDT not present to check.
@@ -123,7 +123,11 @@ acpitables      this will cause the kernel to oops, at best the kernel may
 acpitables      ignore this. However, it should be fixed where possible.
 acpitables      
 acpitables      
+acpitables      Test 2 of 2: Test ACPI headers.
+acpitables      PASSED: Test 2, Table XSDT has valid signature and ID
+acpitables      strings.
+acpitables      
 acpitables      ==========================================================
-acpitables      0 passed, 14 failed, 0 warning, 0 aborted, 0 skipped, 0
+acpitables      1 passed, 14 failed, 0 warning, 0 aborted, 0 skipped, 0
 acpitables      info only.
 acpitables      ==========================================================
diff --git a/fwts-test/acpitables-0008/acpitables-0001.log b/fwts-test/acpitables-0008/acpitables-0001.log
index 124b75a..b6de722 100644
--- a/fwts-test/acpitables-0008/acpitables-0001.log
+++ b/fwts-test/acpitables-0008/acpitables-0001.log
@@ -1,6 +1,6 @@
 acpitables      acpitables: ACPI table settings sanity tests.
 acpitables      ----------------------------------------------------------
-acpitables      Test 1 of 1: Test ACPI tables.
+acpitables      Test 1 of 2: Test ACPI tables.
 acpitables      Cannot find FACP.
 acpitables      Table APIC not present to check.
 acpitables      Table ECDT not present to check.
@@ -12,7 +12,10 @@ acpitables      Table RSDP not present to check.
 acpitables      Table SBST not present to check.
 acpitables      Table XSDT not present to check.
 acpitables      
+acpitables      Test 2 of 2: Test ACPI headers.
+acpitables      ABORTED: Test 2, Cannot find any ACPI tables.
+acpitables      
 acpitables      ==========================================================
-acpitables      0 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0
+acpitables      0 passed, 0 failed, 0 warning, 1 aborted, 0 skipped, 0
 acpitables      info only.
 acpitables      ==========================================================
-- 
1.9.1




More information about the fwts-devel mailing list