diff -Nru fwts-16.02.00/debian/changelog fwts-16.03.00/debian/changelog --- fwts-16.02.00/debian/changelog 2016-02-25 07:56:45.000000000 +0000 +++ fwts-16.03.00/debian/changelog 2016-03-15 05:43:06.000000000 +0000 @@ -1,3 +1,37 @@ +fwts (16.03.00-0ubuntu1~v) vivid; urgency=low + + [Alex Hung] + * acpi: csrt: fix a spelling mistake in a comment + * acpi: csrt: fix resource descriptor can go over boundary + + [Colin Ian King] + * debian/control: Add s390x to Architecture list (LP: #1549737) + * lib: fwts_cpu: fix memory leak and incorrect return (LP: #1549723) + * Add s390x build support, don't build ACPI specific code for this arch + * Add s390x build support: skip tests that are not build in for this arch + * Add s390x build support, don't build UEFI specific code for this arch + * Debian/control: don't build UEFI kernel module for s390x + * acpi: fan: fix indentation, remove extraneous tab + * acpi: method: fix a few incorrectly idented lines of code + * bios: mpcheck: fix trivial indentation issue + * bios: mpdump: fix trivial indentation issue + * uefi: uefirtvariable: fix trivial indentation issues + * uefi: uefirtauthvar: fix trivial indentation issues + * smatchify: add two passes option + + [Ivan Hu] + * uefi: add sanity check for UEFI ESRT table (LP: #1553043) + * uefi: esrt: don't build UEFI specific code for s390x + * fwts-test: Update tests to sync with esrt test adding + * uefi: esrt: fix the resource leak found by Coverity Scan + * uefi: esrt: fix build failure due to lack of header file + * acpi: method: fix faile check on _EC control method (LP: #1556720) + * acpi: method: fix _ON method never be tested. + * acpi: method: remove some reduntant and unused tests. + * fwts-test: sync up with the fwts method tests changed + + -- Alex Hung Mon, 14 Mar 2016 17:09:08 +0800 + fwts (16.02.00-0ubuntu1~v) vivid; urgency=low [Al Stone] diff -Nru fwts-16.02.00/debian/control fwts-16.03.00/debian/control --- fwts-16.02.00/debian/control 2016-02-25 07:56:45.000000000 +0000 +++ fwts-16.03.00/debian/control 2016-03-15 05:43:06.000000000 +0000 @@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 7.0.50~), autoconf, automake, libtool, libjson0-dev (>= 0.9), flex, bison, hardening-wrapper, dh-autoreconf, dkms, libglib2.0-dev, pkg-config Package: fwts -Architecture: i386 amd64 armel armhf arm64 ppc64 ppc64el +Architecture: i386 amd64 armel armhf arm64 ppc64 ppc64el s390x Depends: libfwtsiasl1 (= ${binary:Version}), libfwtsacpica1 (= ${binary:Version}), libfwts1 (= ${binary:Version}), fwts-efi-runtime-dkms (= ${binary:Version}) [amd64] , ${shlibs:Depends}, ${misc:Depends}, pciutils Suggests: dmidecode Description: FirmWare Test Suite @@ -18,7 +18,7 @@ be a Linux-centric firmware troubleshooting tool. Package: libfwtsiasl1 -Architecture: i386 amd64 armel armhf arm64 ppc64 ppc64el +Architecture: i386 amd64 armel armhf arm64 ppc64 ppc64el s390x Depends: ${shlibs:Depends}, ${misc:Depends} Description: FirmWare Test Suite ACPICA core built for iasl functionality The firmware test suite requires the ACPICA core engine to be built in @@ -28,7 +28,7 @@ interface with fwts. Package: libfwtsacpica1 -Architecture: i386 amd64 armel armhf arm64 ppc64 ppc64el +Architecture: i386 amd64 armel armhf arm64 ppc64 ppc64el s390x Depends: ${shlibs:Depends}, ${misc:Depends} Description: FirmWare Test Suite ACPICA core built for acpiexec functionality The firmware test suite requires the ACPICA core engine to be built in @@ -37,7 +37,7 @@ contains this code with a thin fwts specific API to interface with fwts. Package: libfwts1 -Architecture: i386 amd64 armel armhf arm64 ppc64 ppc64el +Architecture: i386 amd64 armel armhf arm64 ppc64 ppc64el s390x Depends: ${shlibs:Depends}, ${misc:Depends} Description: FirmWare Test Suite core support library This is the fwts core library. It contains a top level test framework @@ -45,7 +45,7 @@ various fwts tests. Package: fwts-frontend -Architecture: i386 amd64 armel armhf arm64 ppc64 ppc64el +Architecture: i386 amd64 armel armhf arm64 ppc64 ppc64el s390x Priority: optional Depends: ${shlibs:Depends}, ${misc:Depends}, dialog, fwts Description: Firmware Test Suite frontend interface diff -Nru fwts-16.02.00/fwts-test/acpidump-0001/test-0001.sh fwts-16.03.00/fwts-test/acpidump-0001/test-0001.sh --- fwts-16.02.00/fwts-test/acpidump-0001/test-0001.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/acpidump-0001/test-0001.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/acpidump.log.$$ +$FWTS --show-tests | grep acpidump > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/acpidump-0001/acpidump.log acpidump - | grep "^[0-9]*[ ]*acpidump" | cut -c7- > $TMPLOG diff $TMPLOG $FWTSTESTDIR/acpidump-0001/acpidump-0001.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/acpitables-0001/test-0001.sh fwts-16.03.00/fwts-test/acpitables-0001/test-0001.sh --- fwts-16.02.00/fwts-test/acpitables-0001/test-0001.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/acpitables-0001/test-0001.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/acpitables.log.$$ +$FWTS --show-tests | grep acpitables > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/acpitables-0001/acpidump-0001.log acpitables - | grep "^[0-9]*[ ]*acpitables" | cut -c7- > $TMPLOG diff $TMPLOG $FWTSTESTDIR/acpitables-0001/acpitables-0001.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/arg-help-0001/test-0001.sh fwts-16.03.00/fwts-test/arg-help-0001/test-0001.sh --- fwts-16.02.00/fwts-test/arg-help-0001/test-0001.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/arg-help-0001/test-0001.sh 2016-03-14 09:10:20.000000000 +0000 @@ -8,7 +8,7 @@ # # Non-x86 tests don't have WMI so skip this test # -$FWTS --show-tests | grep wmi > /dev/null +$FWTS --show-tests | grep WMI > /dev/null if [ $? -eq 1 ]; then echo SKIP: $TEST, $NAME exit 77 diff -Nru fwts-16.02.00/fwts-test/arg-help-0001/test-0002.sh fwts-16.03.00/fwts-test/arg-help-0001/test-0002.sh --- fwts-16.02.00/fwts-test/arg-help-0001/test-0002.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/arg-help-0001/test-0002.sh 2016-03-14 09:10:20.000000000 +0000 @@ -8,7 +8,7 @@ # # Non-x86 tests don't have WMI so skip this test # -$FWTS --show-tests | grep wmi > /dev/null +$FWTS --show-tests | grep WMI > /dev/null if [ $? -eq 1 ]; then echo SKIP: $TEST, $NAME exit 77 diff -Nru fwts-16.02.00/fwts-test/arg-show-tests-0001/arg-show-tests-0001.log fwts-16.03.00/fwts-test/arg-show-tests-0001/arg-show-tests-0001.log --- fwts-16.02.00/fwts-test/arg-show-tests-0001/arg-show-tests-0001.log 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/arg-show-tests-0001/arg-show-tests-0001.log 2016-03-14 09:10:20.000000000 +0000 @@ -164,6 +164,7 @@ UEFI tests: csm UEFI Compatibility Support Module test. + esrt Sanity check UEFI ESRT Table. securebootcert UEFI secure boot test. uefibootpath Sanity check for UEFI Boot Path Boot####. uefirtauthvar Authenticated variable tests. diff -Nru fwts-16.02.00/fwts-test/arg-show-tests-full-0001/arg-show-tests-full-0001.log fwts-16.03.00/fwts-test/arg-show-tests-full-0001/arg-show-tests-full-0001.log --- fwts-16.02.00/fwts-test/arg-show-tests-full-0001/arg-show-tests-full-0001.log 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/arg-show-tests-full-0001/arg-show-tests-full-0001.log 2016-03-14 09:10:20.000000000 +0000 @@ -70,7 +70,7 @@ Validate MCFG PCI config space. mchi (1 test): MCHI Management Controller Host Interface Table test. - method (195 tests): + method (189 tests): Test Method Names. Test _AEI. Test _EVT (Event Method). @@ -116,7 +116,7 @@ Test _GLK (Global Lock). Test _SEG (Segment). Test _OFF (Set resource off). - Test _ON (Set resource on). + Test _ON_ (Set resource on). Test _DSW (Device Sleep Wake). Test _IRC (In Rush Current). Test _PRE (Power Resources for Enumeration). @@ -239,15 +239,9 @@ Test _TZM (Thermal Zone member). Test _TZP (Thermal Zone Polling). Test _GPE (General Purpose Events). - Test _EC (EC Offset Query). + Test _EC_ (EC Offset Query). Test _PTS (Prepare to Sleep). Test _TTS (Transition to State). - Test _S0 (System S0 State). - Test _S1 (System S1 State). - Test _S2 (System S2 State). - Test _S3 (System S3 State). - Test _S4 (System S4 State). - Test _S5 (System S5 State). Test _WAK (System Wake). Test _ADR (Return Unique ID for Device). Test _BCL (Query List of Brightness Control Levels Supported). @@ -418,7 +412,7 @@ Validate MCFG PCI config space. mchi (1 test): MCHI Management Controller Host Interface Table test. - method (195 tests): + method (189 tests): Test Method Names. Test _AEI. Test _EVT (Event Method). @@ -464,7 +458,7 @@ Test _GLK (Global Lock). Test _SEG (Segment). Test _OFF (Set resource off). - Test _ON (Set resource on). + Test _ON_ (Set resource on). Test _DSW (Device Sleep Wake). Test _IRC (In Rush Current). Test _PRE (Power Resources for Enumeration). @@ -587,15 +581,9 @@ Test _TZM (Thermal Zone member). Test _TZP (Thermal Zone Polling). Test _GPE (General Purpose Events). - Test _EC (EC Offset Query). + Test _EC_ (EC Offset Query). Test _PTS (Prepare to Sleep). Test _TTS (Transition to State). - Test _S0 (System S0 State). - Test _S1 (System S1 State). - Test _S2 (System S2 State). - Test _S3 (System S3 State). - Test _S4 (System S4 State). - Test _S5 (System S5 State). Test _WAK (System Wake). Test _ADR (Return Unique ID for Device). Test _BCL (Query List of Brightness Control Levels Supported). @@ -829,6 +817,8 @@ UEFI tests: csm (1 test): UEFI Compatibility Support Module test. + esrt (1 test): + Sanity check UEFI ESRT Table. securebootcert (1 test): UEFI secure boot test. uefibootpath (1 test): diff -Nru fwts-16.02.00/fwts-test/arg-table-path-0001/test-0001.sh fwts-16.03.00/fwts-test/arg-table-path-0001/test-0001.sh --- fwts-16.02.00/fwts-test/arg-table-path-0001/test-0001.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/arg-table-path-0001/test-0001.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,13 @@ NAME=test-0001.sh TMPLOG=$TMP/acpidump.log.$$ HERE=$FWTSTESTDIR/arg-table-path-0001 + +$FWTS --show-tests | grep acpidump > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + # # Unfortunately we can pull in the tables in different order depending # on the way the tables are stored in the directory. Since we only care diff -Nru fwts-16.02.00/fwts-test/arg-table-path-0001/test-0002.sh fwts-16.03.00/fwts-test/arg-table-path-0001/test-0002.sh --- fwts-16.02.00/fwts-test/arg-table-path-0001/test-0002.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/arg-table-path-0001/test-0002.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,13 @@ NAME=test-0002.sh TMPLOG=$TMP/acpidump.log.$$ HERE=$FWTSTESTDIR/arg-table-path-0001 + +$FWTS --show-tests | grep acpidump > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + # # Unfortunately we can pull in the tables in different order depending # on the way the tables are stored in the directory. Since we only care diff -Nru fwts-16.02.00/fwts-test/asf-0001/test-0001.sh fwts-16.03.00/fwts-test/asf-0001/test-0001.sh --- fwts-16.02.00/fwts-test/asf-0001/test-0001.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/asf-0001/test-0001.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/asf.log.$$ +$FWTS --show-tests | grep ASF > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/asf-0001/acpidump-0001.log asf - | cut -c7- | grep "^asf" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/asf-0001/asf-0001.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/asf-0001/test-0002.sh fwts-16.03.00/fwts-test/asf-0001/test-0002.sh --- fwts-16.02.00/fwts-test/asf-0001/test-0002.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/asf-0001/test-0002.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0002.sh TMPLOG=$TMP/asf.log.$$ +$FWTS --show-tests | grep ASF > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/asf-0001/acpidump-0002.log asf - | cut -c7- | grep "^asf" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/asf-0001/asf-0002.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/aspt-0001/test-0001.sh fwts-16.03.00/fwts-test/aspt-0001/test-0001.sh --- fwts-16.02.00/fwts-test/aspt-0001/test-0001.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/aspt-0001/test-0001.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/aspt.log.$$ +$FWTS --show-tests | grep ASPT > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/aspt-0001/acpidump-0001.log aspt - | cut -c7- | grep "^aspt" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/aspt-0001/aspt-0001.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/aspt-0001/test-0002.sh fwts-16.03.00/fwts-test/aspt-0001/test-0002.sh --- fwts-16.02.00/fwts-test/aspt-0001/test-0002.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/aspt-0001/test-0002.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/aspt.log.$$ +$FWTS --show-tests | grep ASPT > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/aspt-0001/acpidump-0002.log aspt - | cut -c7- | grep "^aspt" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/aspt-0001/aspt-0002.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/bert-0001/test-0001.sh fwts-16.03.00/fwts-test/bert-0001/test-0001.sh --- fwts-16.02.00/fwts-test/bert-0001/test-0001.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/bert-0001/test-0001.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/bert.log.$$ +$FWTS --show-tests | grep BERT > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/bert-0001/acpidump-0001.log bert - | cut -c7- | grep "^bert" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/bert-0001/bert-0001.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/bert-0001/test-0002.sh fwts-16.03.00/fwts-test/bert-0001/test-0002.sh --- fwts-16.02.00/fwts-test/bert-0001/test-0002.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/bert-0001/test-0002.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/bert.log.$$ +$FWTS --show-tests | grep BERT > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/bert-0001/acpidump-0002.log bert - | cut -c7- | grep "^bert" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/bert-0001/bert-0002.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/bgrt-0001/test-0001.sh fwts-16.03.00/fwts-test/bgrt-0001/test-0001.sh --- fwts-16.02.00/fwts-test/bgrt-0001/test-0001.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/bgrt-0001/test-0001.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/bgrt.log.$$ +$FWTS --show-tests | grep bgrt > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/bgrt-0001/acpidump-0001.log bgrt - | cut -c7- | grep "^bgrt" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/bgrt-0001/bgrt-0001.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/bgrt-0001/test-0002.sh fwts-16.03.00/fwts-test/bgrt-0001/test-0002.sh --- fwts-16.02.00/fwts-test/bgrt-0001/test-0002.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/bgrt-0001/test-0002.sh 2016-03-14 09:10:20.000000000 +0000 @@ -1,9 +1,15 @@ #!/bin/bash # -TEST="Test apcitables against invalid GBRT" +TEST="Test apcitables against invalid BGRT" NAME=test-0001.sh TMPLOG=$TMP/bgrt.log.$$ +$FWTS --show-tests | grep bgrt > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/bgrt-0001/acpidump-0002.log bgrt - | cut -c7- | grep "^bgrt" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/bgrt-0001/bgrt-0002.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/boot-0001/test-0001.sh fwts-16.03.00/fwts-test/boot-0001/test-0001.sh --- fwts-16.02.00/fwts-test/boot-0001/test-0001.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/boot-0001/test-0001.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/boot.log.$$ +$FWTS --show-tests | grep BOOT > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/boot-0001/acpidump-0001.log boot - | cut -c7- | grep "^boot" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/boot-0001/boot-0001.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/boot-0001/test-0002.sh fwts-16.03.00/fwts-test/boot-0001/test-0002.sh --- fwts-16.02.00/fwts-test/boot-0001/test-0002.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/boot-0001/test-0002.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/boot.log.$$ +$FWTS --show-tests | grep BOOT > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/boot-0001/acpidump-0002.log boot - | cut -c7- | grep "^boot" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/boot-0001/boot-0002.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/checksum-0001/test-0001.sh fwts-16.03.00/fwts-test/checksum-0001/test-0001.sh --- fwts-16.02.00/fwts-test/checksum-0001/test-0001.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/checksum-0001/test-0001.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/checksum.log.$$ +$FWTS --show-tests | grep checksum > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 120 --dumpfile=$FWTSTESTDIR/checksum-0001/acpidump-0001.log checksum - | grep "^[0-9]*[ ]*checksum" | grep -v RSDP | cut -c7- > $TMPLOG diff $TMPLOG $FWTSTESTDIR/checksum-0001/checksum-0001.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/checksum-0001/test-0003.sh fwts-16.03.00/fwts-test/checksum-0001/test-0003.sh --- fwts-16.02.00/fwts-test/checksum-0001/test-0003.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/checksum-0001/test-0003.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0003.sh TMPLOG=$TMP/checksum.log.$$ +$FWTS --show-tests | grep checksum > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 120 --dumpfile=$FWTSTESTDIR/checksum-0001/acpidump-0003.log checksum - | grep "^[0-9]*[ ]*checksum" | grep -v RSDP | cut -c7- > $TMPLOG diff $TMPLOG $FWTSTESTDIR/checksum-0001/checksum-0003.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/checksum-0001/test-0004.sh fwts-16.03.00/fwts-test/checksum-0001/test-0004.sh --- fwts-16.02.00/fwts-test/checksum-0001/test-0004.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/checksum-0001/test-0004.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0004.sh TMPLOG=$TMP/checksum.log.$$ +$FWTS --show-tests | grep checksum > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 120 --dumpfile=$FWTSTESTDIR/checksum-0001/acpidump-0004.log checksum - | grep "^[0-9]*[ ]*checksum" | grep -v RSDP | cut -c7- > $TMPLOG diff $TMPLOG $FWTSTESTDIR/checksum-0001/checksum-0004.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/cpep-0001/test-0001.sh fwts-16.03.00/fwts-test/cpep-0001/test-0001.sh --- fwts-16.02.00/fwts-test/cpep-0001/test-0001.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/cpep-0001/test-0001.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/cpep.log.$$ +$FWTS --show-tests | grep CPEP > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/cpep-0001/acpidump-0001.log cpep - | cut -c7- | grep "^cpep" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/cpep-0001/cpep-0001.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/cpep-0001/test-0002.sh fwts-16.03.00/fwts-test/cpep-0001/test-0002.sh --- fwts-16.02.00/fwts-test/cpep-0001/test-0002.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/cpep-0001/test-0002.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/cpep.log.$$ +$FWTS --show-tests | grep CPEP > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/cpep-0001/acpidump-0002.log cpep - | cut -c7- | grep "^cpep" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/cpep-0001/cpep-0002.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/csrt-0001/test-0001.sh fwts-16.03.00/fwts-test/csrt-0001/test-0001.sh --- fwts-16.02.00/fwts-test/csrt-0001/test-0001.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/csrt-0001/test-0001.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/csrt.log.$$ +$FWTS --show-tests | grep CSRT > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/csrt-0001/acpidump-0001.log csrt - | cut -c7- | grep "^csrt" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/csrt-0001/csrt-0001.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/csrt-0001/test-0002.sh fwts-16.03.00/fwts-test/csrt-0001/test-0002.sh --- fwts-16.02.00/fwts-test/csrt-0001/test-0002.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/csrt-0001/test-0002.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0002.sh TMPLOG=$TMP/csrt.log.$$ +$FWTS --show-tests | grep CSRT > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/csrt-0001/acpidump-0002.log csrt - | cut -c7- | grep "^csrt" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/csrt-0001/csrt-0002.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/dbg2-0001/test-0001.sh fwts-16.03.00/fwts-test/dbg2-0001/test-0001.sh --- fwts-16.02.00/fwts-test/dbg2-0001/test-0001.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/dbg2-0001/test-0001.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/dbg2.log.$$ +$FWTS --show-tests | grep DBG2 > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/dbg2-0001/acpidump-0001.log dbg2 - | cut -c7- | grep "^dbg2" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/dbg2-0001/dbg2-0001.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/dbg2-0001/test-0002.sh fwts-16.03.00/fwts-test/dbg2-0001/test-0002.sh --- fwts-16.02.00/fwts-test/dbg2-0001/test-0002.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/dbg2-0001/test-0002.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/dbg2.log.$$ +$FWTS --show-tests | grep DBG2 > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/dbg2-0001/acpidump-0002.log dbg2 - | cut -c7- | grep "^dbg2" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/dbg2-0001/dbg2-0002.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/dbgp-0001/test-0001.sh fwts-16.03.00/fwts-test/dbgp-0001/test-0001.sh --- fwts-16.02.00/fwts-test/dbgp-0001/test-0001.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/dbgp-0001/test-0001.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/dbgp.log.$$ +$FWTS --show-tests | grep DBGP > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/dbgp-0001/acpidump-0001.log dbgp - | cut -c7- | grep "^dbgp" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/dbgp-0001/dbgp-0001.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/dbgp-0001/test-0002.sh fwts-16.03.00/fwts-test/dbgp-0001/test-0002.sh --- fwts-16.02.00/fwts-test/dbgp-0001/test-0002.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/dbgp-0001/test-0002.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/dbgp.log.$$ +$FWTS --show-tests | grep DBGP > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/dbgp-0001/acpidump-0002.log dbgp - | cut -c7- | grep "^dbgp" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/dbgp-0001/dbgp-0002.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/disassemble-0001/test-0001.sh fwts-16.03.00/fwts-test/disassemble-0001/test-0001.sh --- fwts-16.02.00/fwts-test/disassemble-0001/test-0001.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/disassemble-0001/test-0001.sh 2016-03-14 09:10:20.000000000 +0000 @@ -6,6 +6,12 @@ TMPLOG=$TMP/disassemble-aml.log.$$ HERE=$FWTSTESTDIR/disassemble-0001 +($FWTS fwts --disassemble-aml 2>&1 | grep "option not available") > /dev/null +if [ $? -eq 0 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + mkdir $TMPDIR $FWTS -w 80 --dumpfile=$HERE/acpidump.log --disassemble-aml=$TMPDIR - > $TMPLOG diff -Nru fwts-16.02.00/fwts-test/erst-0001/test-0001.sh fwts-16.03.00/fwts-test/erst-0001/test-0001.sh --- fwts-16.02.00/fwts-test/erst-0001/test-0001.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/erst-0001/test-0001.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/erst.log.$$ +$FWTS --show-tests | grep ERST > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/erst-0001/acpidump-0001.log erst - | cut -c7- | grep "^erst" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/erst-0001/erst-0001.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/erst-0001/test-0002.sh fwts-16.03.00/fwts-test/erst-0001/test-0002.sh --- fwts-16.02.00/fwts-test/erst-0001/test-0002.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/erst-0001/test-0002.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0002.sh TMPLOG=$TMP/erst.log.$$ +$FWTS --show-tests | grep ERST > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/erst-0001/acpidump-0002.log erst - | cut -c7- | grep "^erst" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/erst-0001/erst-0002.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/erst-0001/test-0003.sh fwts-16.03.00/fwts-test/erst-0001/test-0003.sh --- fwts-16.02.00/fwts-test/erst-0001/test-0003.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/erst-0001/test-0003.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0003.sh TMPLOG=$TMP/erst.log.$$ +$FWTS --show-tests | grep ERST > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/erst-0001/acpidump-0003.log erst - | cut -c7- | grep "^erst" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/erst-0001/erst-0003.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/facs-0001/test-0001.sh fwts-16.03.00/fwts-test/facs-0001/test-0001.sh --- fwts-16.02.00/fwts-test/facs-0001/test-0001.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/facs-0001/test-0001.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/facs.log.$$ +$FWTS --show-tests | grep FACS > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/facs-0001/acpidump-0001.log facs - | cut -c7- | grep "^facs" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/facs-0001/facs-0001.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/facs-0001/test-0002.sh fwts-16.03.00/fwts-test/facs-0001/test-0002.sh --- fwts-16.02.00/fwts-test/facs-0001/test-0002.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/facs-0001/test-0002.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/facs.log.$$ +$FWTS --show-tests | grep FACS > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/facs-0001/acpidump-0002.log facs - | cut -c7- | grep "^facs" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/facs-0001/facs-0002.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/fpdt-0001/test-0001.sh fwts-16.03.00/fwts-test/fpdt-0001/test-0001.sh --- fwts-16.02.00/fwts-test/fpdt-0001/test-0001.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/fpdt-0001/test-0001.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/fpdt.log.$$ +$FWTS --show-tests | grep FPDT > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/fpdt-0001/acpidump-0001.log fpdt - | cut -c7- | grep "^fpdt" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/fpdt-0001/fpdt-0001.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/fpdt-0001/test-0002.sh fwts-16.03.00/fwts-test/fpdt-0001/test-0002.sh --- fwts-16.02.00/fwts-test/fpdt-0001/test-0002.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/fpdt-0001/test-0002.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/fpdt.log.$$ +$FWTS --show-tests | grep FPDT > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/fpdt-0001/acpidump-0002.log fpdt - | cut -c7- | grep "^fpdt" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/fpdt-0001/fpdt-0002.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/hest-0001/test-0001.sh fwts-16.03.00/fwts-test/hest-0001/test-0001.sh --- fwts-16.02.00/fwts-test/hest-0001/test-0001.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/hest-0001/test-0001.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/hest.log.$$ +$FWTS --show-tests | grep HEST > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/hest-0001/acpidump-0001.log hest - | cut -c7- | grep "^hest" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/hest-0001/hest-0001.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/hest-0001/test-0002.sh fwts-16.03.00/fwts-test/hest-0001/test-0002.sh --- fwts-16.02.00/fwts-test/hest-0001/test-0002.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/hest-0001/test-0002.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/hest.log.$$ +$FWTS --show-tests | grep HEST > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/hest-0001/acpidump-0002.log hest - | cut -c7- | grep "^hest" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/hest-0001/hest-0002.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/iort-0001/test-0001.sh fwts-16.03.00/fwts-test/iort-0001/test-0001.sh --- fwts-16.02.00/fwts-test/iort-0001/test-0001.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/iort-0001/test-0001.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/iort.log.$$ +$FWTS --show-tests | grep IORT > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/iort-0001/acpidump-0001.log iort - | cut -c7- | grep "^iort" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/iort-0001/iort-0001.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/iort-0001/test-0002.sh fwts-16.03.00/fwts-test/iort-0001/test-0002.sh --- fwts-16.02.00/fwts-test/iort-0001/test-0002.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/iort-0001/test-0002.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/iort.log.$$ +$FWTS --show-tests | grep IORT > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/iort-0001/acpidump-0002.log iort - | cut -c7- | grep "^iort" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/iort-0001/iort-0002.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/lpit-0001/test-0001.sh fwts-16.03.00/fwts-test/lpit-0001/test-0001.sh --- fwts-16.02.00/fwts-test/lpit-0001/test-0001.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/lpit-0001/test-0001.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/lpit.log.$$ +$FWTS --show-tests | grep LPIT > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/lpit-0001/acpidump-0001.log lpit - | cut -c7- | grep "^lpit" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/lpit-0001/lpit-0001.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/lpit-0001/test-0002.sh fwts-16.03.00/fwts-test/lpit-0001/test-0002.sh --- fwts-16.02.00/fwts-test/lpit-0001/test-0002.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/lpit-0001/test-0002.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/lpit.log.$$ +$FWTS --show-tests | grep LPIT > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/lpit-0001/acpidump-0002.log lpit - | cut -c7- | grep "^lpit" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/lpit-0001/lpit-0002.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/madt-0001/test-0001.sh fwts-16.03.00/fwts-test/madt-0001/test-0001.sh --- fwts-16.02.00/fwts-test/madt-0001/test-0001.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/madt-0001/test-0001.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/madt.log.$$ +$FWTS --show-tests | grep MADT > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/madt-0001/acpidump-0001.log madt - | cut -c7- | grep "^madt" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/madt-0001/madt-0001.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/madt-0001/test-0002.sh fwts-16.03.00/fwts-test/madt-0001/test-0002.sh --- fwts-16.02.00/fwts-test/madt-0001/test-0002.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/madt-0001/test-0002.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0002.sh TMPLOG=$TMP/madt.log.$$ +$FWTS --show-tests | grep MADT > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/madt-0001/acpidump-0002.log madt - | cut -c7- | grep "^madt" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/madt-0001/madt-0002.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/mchi-0001/test-0001.sh fwts-16.03.00/fwts-test/mchi-0001/test-0001.sh --- fwts-16.02.00/fwts-test/mchi-0001/test-0001.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/mchi-0001/test-0001.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/mchi.log.$$ +$FWTS --show-tests | grep MCHI > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/mchi-0001/acpidump-0001.log mchi - | cut -c7- | grep "^mchi" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/mchi-0001/mchi-0001.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/mchi-0001/test-0002.sh fwts-16.03.00/fwts-test/mchi-0001/test-0002.sh --- fwts-16.02.00/fwts-test/mchi-0001/test-0002.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/mchi-0001/test-0002.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/mchi.log.$$ +$FWTS --show-tests | grep MCHI > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/mchi-0001/acpidump-0002.log mchi - | cut -c7- | grep "^mchi" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/mchi-0001/mchi-0002.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/method-0001/method-0001.log fwts-16.03.00/fwts-test/method-0001/method-0001.log --- fwts-16.02.00/fwts-test/method-0001/method-0001.log 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/method-0001/method-0001.log 2016-03-14 09:10:20.000000000 +0000 @@ -1,37 +1,37 @@ method method: ACPI DSDT Method Semantic tests. method ---------------------------------------------------------- -method Test 1 of 195: Test Method Names. +method Test 1 of 189: Test Method Names. method Found 1061 Objects method PASSED: Test 1, Method names contain legal characters. method -method Test 2 of 195: Test _AEI. +method Test 2 of 189: Test _AEI. method SKIPPED: Test 2, Skipping test for non-existant object method _AEI. method -method Test 3 of 195: Test _EVT (Event Method). +method Test 3 of 189: Test _EVT (Event Method). method SKIPPED: Test 3, Skipping test for non-existant object method _EVT. method -method Test 4 of 195: Test _DLM (Device Lock Mutex). +method Test 4 of 189: Test _DLM (Device Lock Mutex). method SKIPPED: Test 4, Skipping test for non-existant object method _DLM. method -method Test 5 of 195: Test _PIC (Inform AML of Interrupt Model). +method Test 5 of 189: Test _PIC (Inform AML of Interrupt Model). method PASSED: Test 5, \_PIC returned no values as expected. method PASSED: Test 5, \_PIC returned no values as expected. method PASSED: Test 5, \_PIC returned no values as expected. method -method Test 6 of 195: Test _CID (Compatible ID). +method Test 6 of 189: Test _CID (Compatible ID). method PASSED: Test 6, \_SB_.PCI0._CID returned an integer method 0x030ad041 (EISA ID PNP0A03). method PASSED: Test 6, \_SB_.PCI0.LPCB.HPET._CID returned an method integer 0x010cd041 (EISA ID PNP0C01). method -method Test 7 of 195: Test _DDN (DOS Device Name). +method Test 7 of 189: Test _DDN (DOS Device Name). method SKIPPED: Test 7, Skipping test for non-existant object method _DDN. method -method Test 8 of 195: Test _HID (Hardware ID). +method Test 8 of 189: Test _HID (Hardware ID). method PASSED: Test 8, \_SB_.AMW0._HID returned a string method 'PNP0C14' as expected. method PASSED: Test 8, \_SB_.LID0._HID returned an integer @@ -85,31 +85,31 @@ method PASSED: Test 8, \_SB_.PCI0.LPCB.PS2M._HID returned an method integer 0x130fd041 (EISA ID PNP0F13). method -method Test 9 of 195: Test _HRV (Hardware Revision Number). +method Test 9 of 189: Test _HRV (Hardware Revision Number). method SKIPPED: Test 9, Skipping test for non-existant object method _HRV. method -method Test 10 of 195: Test _MLS (Multiple Language String). +method Test 10 of 189: Test _MLS (Multiple Language String). method SKIPPED: Test 10, Skipping test for non-existant object method _MLS. method -method Test 11 of 195: Test _PLD (Physical Device Location). +method Test 11 of 189: Test _PLD (Physical Device Location). method SKIPPED: Test 11, Skipping test for non-existant object method _PLD. method -method Test 12 of 195: Test _SUB (Subsystem ID). +method Test 12 of 189: Test _SUB (Subsystem ID). method SKIPPED: Test 12, Skipping test for non-existant object method _SUB. method -method Test 13 of 195: Test _SUN (Slot User Number). +method Test 13 of 189: Test _SUN (Slot User Number). method SKIPPED: Test 13, Skipping test for non-existant object method _SUN. method -method Test 14 of 195: Test _STR (String). +method Test 14 of 189: Test _STR (String). method SKIPPED: Test 14, Skipping test for non-existant object method _STR. method -method Test 15 of 195: Test _UID (Unique ID). +method Test 15 of 189: Test _UID (Unique ID). method PASSED: Test 15, \_SB_.AMW0._UID correctly returned sane method looking value 0x00000000. method PASSED: Test 15, \_SB_.PCI0.PDRC._UID correctly returned @@ -135,11 +135,11 @@ method PASSED: Test 15, \_SB_.PCI0.LPCB.BAT1._UID correctly method returned sane looking value 0x00000001. method -method Test 16 of 195: Test _CDM (Clock Domain). +method Test 16 of 189: Test _CDM (Clock Domain). method SKIPPED: Test 16, Skipping test for non-existant object method _CDM. method -method Test 17 of 195: Test _CRS (Current Resource Settings). +method Test 17 of 189: Test _CRS (Current Resource Settings). method PASSED: Test 17, \_SB_.PCI0._CRS (WORD Address Space method Descriptor) looks sane. method PASSED: Test 17, \_SB_.PCI0.PDRC._CRS (32-bit Fixed @@ -183,11 +183,11 @@ method PASSED: Test 17, \_SB_.PCI0.LPCB.PS2M._CRS (IRQ method Descriptor) looks sane. method -method Test 18 of 195: Test _DSD (Device Specific Data). +method Test 18 of 189: Test _DSD (Device Specific Data). method SKIPPED: Test 18, Skipping test for non-existant object method _DSD. method -method Test 19 of 195: Test _DIS (Disable). +method Test 19 of 189: Test _DIS (Disable). method PASSED: Test 19, \_SB_.PCI0.LPCB.LNKA._DIS returned no method values as expected. method PASSED: Test 19, \_SB_.PCI0.LPCB.LNKB._DIS returned no @@ -205,24 +205,24 @@ method PASSED: Test 19, \_SB_.PCI0.LPCB.LNKH._DIS returned no method values as expected. method -method Test 20 of 195: Test _DMA (Direct Memory Access). +method Test 20 of 189: Test _DMA (Direct Memory Access). method SKIPPED: Test 20, Skipping test for non-existant object method _DMA. method -method Test 21 of 195: Test _FIX (Fixed Register Resource +method Test 21 of 189: Test _FIX (Fixed Register Resource method Provider). method SKIPPED: Test 21, Skipping test for non-existant object method _FIX. method -method Test 22 of 195: Test _GSB (Global System Interrupt Base). +method Test 22 of 189: Test _GSB (Global System Interrupt Base). method SKIPPED: Test 22, Skipping test for non-existant object method _GSB. method -method Test 23 of 195: Test _HPP (Hot Plug Parameters). +method Test 23 of 189: Test _HPP (Hot Plug Parameters). method SKIPPED: Test 23, Skipping test for non-existant object method _HPP. method -method Test 24 of 195: Test _PRS (Possible Resource Settings). +method Test 24 of 189: Test _PRS (Possible Resource Settings). method PASSED: Test 24, \_SB_.PCI0.LPCB.LNKA._PRS (IRQ method Descriptor) looks sane. method PASSED: Test 24, \_SB_.PCI0.LPCB.LNKB._PRS (IRQ @@ -240,7 +240,7 @@ method PASSED: Test 24, \_SB_.PCI0.LPCB.LNKH._PRS (IRQ method Descriptor) looks sane. method -method Test 25 of 195: Test _PRT (PCI Routing Table). +method Test 25 of 189: Test _PRT (PCI Routing Table). method PASSED: Test 25, \_SB_.PCI0._PRT correctly returned a sane method looking package. method PASSED: Test 25, \_SB_.PCI0.PEGP._PRT correctly returned a @@ -260,51 +260,51 @@ method PASSED: Test 25, \_SB_.PCI0.PCIB._PRT correctly returned a method sane looking package. method -method Test 26 of 195: Test _PXM (Proximity). +method Test 26 of 189: Test _PXM (Proximity). method SKIPPED: Test 26, Skipping test for non-existant object method _PXM. method -method Test 27 of 195: Test _CCA (Cache Coherency Attribute). +method Test 27 of 189: Test _CCA (Cache Coherency Attribute). method SKIPPED: Test 27, Skipping test for non-existant object method _CCA. method -method Test 28 of 195: Test _EDL (Eject Device List). +method Test 28 of 189: Test _EDL (Eject Device List). method SKIPPED: Test 28, Skipping test for non-existant object method _EDL. method -method Test 29 of 195: Test _EJD (Ejection Dependent Device). +method Test 29 of 189: Test _EJD (Ejection Dependent Device). method SKIPPED: Test 29, Skipping test for non-existant object method _EJD. method -method Test 30 of 195: Test _EJ0 (Eject). +method Test 30 of 189: Test _EJ0 (Eject). method SKIPPED: Test 30, Skipping test for non-existant object method _EJ0. method -method Test 31 of 195: Test _EJ1 (Eject). +method Test 31 of 189: Test _EJ1 (Eject). method SKIPPED: Test 31, Skipping test for non-existant object method _EJ1. method -method Test 32 of 195: Test _EJ2 (Eject). +method Test 32 of 189: Test _EJ2 (Eject). method SKIPPED: Test 32, Skipping test for non-existant object method _EJ2. method -method Test 33 of 195: Test _EJ3 (Eject). +method Test 33 of 189: Test _EJ3 (Eject). method SKIPPED: Test 33, Skipping test for non-existant object method _EJ3. method -method Test 34 of 195: Test _EJ4 (Eject). +method Test 34 of 189: Test _EJ4 (Eject). method SKIPPED: Test 34, Skipping test for non-existant object method _EJ4. method -method Test 35 of 195: Test _LCK (Lock). +method Test 35 of 189: Test _LCK (Lock). method SKIPPED: Test 35, Skipping test for non-existant object method _LCK. method -method Test 36 of 195: Test _RMV (Remove). +method Test 36 of 189: Test _RMV (Remove). method PASSED: Test 36, \_SB_.PCI0.RP03.PXSX._RMV correctly method returned sane looking value 0x00000001. method -method Test 37 of 195: Test _STA (Status). +method Test 37 of 189: Test _STA (Status). method PASSED: Test 37, \_SB_.PCI0.PEGP.VGA_._STA correctly method returned sane looking value 0x0000000f. method PASSED: Test 37, \_SB_.PCI0.LPCB.LNKA._STA correctly @@ -328,73 +328,73 @@ method PASSED: Test 37, \_SB_.PCI0.LPCB.BAT1._STA correctly method returned sane looking value 0x0000001f. method -method Test 38 of 195: Test _DEP (Operational Region +method Test 38 of 189: Test _DEP (Operational Region method Dependencies). method SKIPPED: Test 38, Skipping test for non-existant object method _DEP. method -method Test 39 of 195: Test _BDN (BIOS Dock Name). +method Test 39 of 189: Test _BDN (BIOS Dock Name). method SKIPPED: Test 39, Skipping test for non-existant object method _BDN. method -method Test 40 of 195: Test _BBN (Base Bus Number). +method Test 40 of 189: Test _BBN (Base Bus Number). method SKIPPED: Test 40, Skipping test for non-existant object method _BBN. method -method Test 41 of 195: Test _DCK (Dock). +method Test 41 of 189: Test _DCK (Dock). method SKIPPED: Test 41, Skipping test for non-existant object method _DCK. method -method Test 42 of 195: Test _INI (Initialize). +method Test 42 of 189: Test _INI (Initialize). method PASSED: Test 42, \_SB_._INI returned no values as method expected. method -method Test 43 of 195: Test _GLK (Global Lock). +method Test 43 of 189: Test _GLK (Global Lock). method SKIPPED: Test 43, Skipping test for non-existant object method _GLK. method -method Test 44 of 195: Test _SEG (Segment). +method Test 44 of 189: Test _SEG (Segment). method SKIPPED: Test 44, Skipping test for non-existant object method _SEG. method -method Test 45 of 195: Test _OFF (Set resource off). +method Test 45 of 189: Test _OFF (Set resource off). method SKIPPED: Test 45, Skipping test for non-existant object method _OFF. method -method Test 46 of 195: Test _ON (Set resource on). +method Test 46 of 189: Test _ON_ (Set resource on). method SKIPPED: Test 46, Skipping test for non-existant object -method _ON. +method _ON_. method -method Test 47 of 195: Test _DSW (Device Sleep Wake). +method Test 47 of 189: Test _DSW (Device Sleep Wake). method SKIPPED: Test 47, Skipping test for non-existant object method _DSW. method -method Test 48 of 195: Test _IRC (In Rush Current). +method Test 48 of 189: Test _IRC (In Rush Current). method SKIPPED: Test 48, Skipping test for non-existant object method _IRC. method -method Test 49 of 195: Test _PRE (Power Resources for +method Test 49 of 189: Test _PRE (Power Resources for method Enumeration). method SKIPPED: Test 49, Skipping test for non-existant object method _PRE. method -method Test 50 of 195: Test _PR0 (Power Resources for D0). +method Test 50 of 189: Test _PR0 (Power Resources for D0). method SKIPPED: Test 50, Skipping test for non-existant object method _PR0. method -method Test 51 of 195: Test _PR1 (Power Resources for D1). +method Test 51 of 189: Test _PR1 (Power Resources for D1). method SKIPPED: Test 51, Skipping test for non-existant object method _PR1. method -method Test 52 of 195: Test _PR2 (Power Resources for D2). +method Test 52 of 189: Test _PR2 (Power Resources for D2). method SKIPPED: Test 52, Skipping test for non-existant object method _PR2. method -method Test 53 of 195: Test _PR3 (Power Resources for D3). +method Test 53 of 189: Test _PR3 (Power Resources for D3). method SKIPPED: Test 53, Skipping test for non-existant object method _PR3. method -method Test 54 of 195: Test _PRW (Power Resources for Wake). +method Test 54 of 189: Test _PRW (Power Resources for Wake). method PASSED: Test 54, \_SB_.PCI0.HDEF._PRW correctly returned a method sane looking package. method PASSED: Test 54, \_SB_.PCI0.RP03.PXSX._PRW correctly @@ -414,34 +414,34 @@ method PASSED: Test 54, \_SB_.PCI0.EHC2._PRW correctly returned a method sane looking package. method -method Test 55 of 195: Test _PS0 (Power State 0). +method Test 55 of 189: Test _PS0 (Power State 0). method PASSED: Test 55, \_SB_.PCI0.PEGP.VGA_._PS0 returned no method values as expected. method PASSED: Test 55, \_PS0 returned no values as expected. method -method Test 56 of 195: Test _PS1 (Power State 1). +method Test 56 of 189: Test _PS1 (Power State 1). method PASSED: Test 56, \_SB_.PCI0.PEGP.VGA_._PS1 returned no method values as expected. method -method Test 57 of 195: Test _PS2 (Power State 2). +method Test 57 of 189: Test _PS2 (Power State 2). method SKIPPED: Test 57, Skipping test for non-existant object method _PS2. method -method Test 58 of 195: Test _PS3 (Power State 3). +method Test 58 of 189: Test _PS3 (Power State 3). method PASSED: Test 58, \_SB_.PCI0.PEGP.VGA_._PS3 returned no method values as expected. method PASSED: Test 58, \_PS3 returned no values as expected. method -method Test 59 of 195: Test _PSC (Power State Current). +method Test 59 of 189: Test _PSC (Power State Current). method PASSED: Test 59, \_SB_.PCI0.PEGP.VGA_._PSC correctly method returned an integer. method PASSED: Test 59, \_PSC correctly returned an integer. method -method Test 60 of 195: Test _PSE (Power State for Enumeration). +method Test 60 of 189: Test _PSE (Power State for Enumeration). method SKIPPED: Test 60, Skipping test for non-existant object method _PSE. method -method Test 61 of 195: Test _PSW (Power State Wake). +method Test 61 of 189: Test _PSW (Power State Wake). method PASSED: Test 61, \_SB_.PCI0.USB1._PSW returned no values method as expected. method PASSED: Test 61, \_SB_.PCI0.USB2._PSW returned no values @@ -453,15 +453,15 @@ method PASSED: Test 61, \_SB_.PCI0.USB5._PSW returned no values method as expected. method -method Test 62 of 195: Test _S1D (S1 Device State). +method Test 62 of 189: Test _S1D (S1 Device State). method SKIPPED: Test 62, Skipping test for non-existant object method _S1D. method -method Test 63 of 195: Test _S2D (S2 Device State). +method Test 63 of 189: Test _S2D (S2 Device State). method SKIPPED: Test 63, Skipping test for non-existant object method _S2D. method -method Test 64 of 195: Test _S3D (S3 Device State). +method Test 64 of 189: Test _S3D (S3 Device State). method PASSED: Test 64, \_SB_.PCI0._S3D correctly returned an method integer. method PASSED: Test 64, \_SB_.PCI0.USB1._S3D correctly returned @@ -479,7 +479,7 @@ method PASSED: Test 64, \_SB_.PCI0.EHC2._S3D correctly returned method an integer. method -method Test 65 of 195: Test _S4D (S4 Device State). +method Test 65 of 189: Test _S4D (S4 Device State). method PASSED: Test 65, \_SB_.PCI0._S4D correctly returned an method integer. method PASSED: Test 65, \_SB_.PCI0.USB1._S4D correctly returned @@ -497,132 +497,132 @@ method PASSED: Test 65, \_SB_.PCI0.EHC2._S4D correctly returned method an integer. method -method Test 66 of 195: Test _S0W (S0 Device Wake State). +method Test 66 of 189: Test _S0W (S0 Device Wake State). method SKIPPED: Test 66, Skipping test for non-existant object method _S0W. method -method Test 67 of 195: Test _S1W (S1 Device Wake State). +method Test 67 of 189: Test _S1W (S1 Device Wake State). method SKIPPED: Test 67, Skipping test for non-existant object method _S1W. method -method Test 68 of 195: Test _S2W (S2 Device Wake State). +method Test 68 of 189: Test _S2W (S2 Device Wake State). method SKIPPED: Test 68, Skipping test for non-existant object method _S2W. method -method Test 69 of 195: Test _S3W (S3 Device Wake State). +method Test 69 of 189: Test _S3W (S3 Device Wake State). method SKIPPED: Test 69, Skipping test for non-existant object method _S3W. method -method Test 70 of 195: Test _S4W (S4 Device Wake State). +method Test 70 of 189: Test _S4W (S4 Device Wake State). method SKIPPED: Test 70, Skipping test for non-existant object method _S4W. method -method Test 71 of 195: Test _RST (Device Reset). +method Test 71 of 189: Test _RST (Device Reset). method SKIPPED: Test 71, Skipping test for non-existant object method _RST. method -method Test 72 of 195: Test _PRR (Power Resource for Reset). +method Test 72 of 189: Test _PRR (Power Resource for Reset). method SKIPPED: Test 72, Skipping test for non-existant object method _PRR. method -method Test 73 of 195: Test _S0_ (S0 System State). +method Test 73 of 189: Test _S0_ (S0 System State). method \_S0_ PM1a_CNT.SLP_TYP value: 0x00000000 method \_S0_ PM1b_CNT.SLP_TYP value: 0x00000000 method PASSED: Test 73, \_S0_ correctly returned a sane looking method package. method -method Test 74 of 195: Test _S1_ (S1 System State). +method Test 74 of 189: Test _S1_ (S1 System State). method SKIPPED: Test 74, Skipping test for non-existant object method _S1_. method -method Test 75 of 195: Test _S2_ (S2 System State). +method Test 75 of 189: Test _S2_ (S2 System State). method SKIPPED: Test 75, Skipping test for non-existant object method _S2_. method -method Test 76 of 195: Test _S3_ (S3 System State). +method Test 76 of 189: Test _S3_ (S3 System State). method \_S3_ PM1a_CNT.SLP_TYP value: 0x00000005 method \_S3_ PM1b_CNT.SLP_TYP value: 0x00000005 method PASSED: Test 76, \_S3_ correctly returned a sane looking method package. method -method Test 77 of 195: Test _S4_ (S4 System State). +method Test 77 of 189: Test _S4_ (S4 System State). method \_S4_ PM1a_CNT.SLP_TYP value: 0x00000006 method \_S4_ PM1b_CNT.SLP_TYP value: 0x00000006 method PASSED: Test 77, \_S4_ correctly returned a sane looking method package. method -method Test 78 of 195: Test _S5_ (S5 System State). +method Test 78 of 189: Test _S5_ (S5 System State). method \_S5_ PM1a_CNT.SLP_TYP value: 0x00000007 method \_S5_ PM1b_CNT.SLP_TYP value: 0x00000007 method PASSED: Test 78, \_S5_ correctly returned a sane looking method package. method -method Test 79 of 195: Test _SWS (System Wake Source). +method Test 79 of 189: Test _SWS (System Wake Source). method SKIPPED: Test 79, Skipping test for non-existant object method _SWS. method -method Test 80 of 195: Test _PSS (Performance Supported States). +method Test 80 of 189: Test _PSS (Performance Supported States). method SKIPPED: Test 80, Skipping test for non-existant object method _PSS. method -method Test 81 of 195: Test _CPC (Continuous Performance +method Test 81 of 189: Test _CPC (Continuous Performance method Control). method SKIPPED: Test 81, Skipping test for non-existant object method _CPC. method -method Test 82 of 195: Test _CSD (C State Dependencies). +method Test 82 of 189: Test _CSD (C State Dependencies). method SKIPPED: Test 82, Skipping test for non-existant object method _CSD. method -method Test 83 of 195: Test _CST (C States). +method Test 83 of 189: Test _CST (C States). method SKIPPED: Test 83, Skipping test for non-existant object method _CST. method -method Test 84 of 195: Test _PCT (Performance Control). +method Test 84 of 189: Test _PCT (Performance Control). method SKIPPED: Test 84, Skipping test for non-existant object method _PCT. method -method Test 85 of 195: Test _PDL (P-State Depth Limit). +method Test 85 of 189: Test _PDL (P-State Depth Limit). method SKIPPED: Test 85, Skipping test for non-existant object method _PDL. method -method Test 86 of 195: Test _PPC (Performance Present +method Test 86 of 189: Test _PPC (Performance Present method Capabilities). method SKIPPED: Test 86, Skipping test for non-existant object method _PPC. method -method Test 87 of 195: Test _PPE (Polling for Platform Error). +method Test 87 of 189: Test _PPE (Polling for Platform Error). method SKIPPED: Test 87, Skipping test for non-existant object method _PPE. method -method Test 88 of 195: Test _PSD (Power State Dependencies). +method Test 88 of 189: Test _PSD (Power State Dependencies). method SKIPPED: Test 88, Skipping test for non-existant object method _PSD. method -method Test 89 of 195: Test _PTC (Processor Throttling Control). +method Test 89 of 189: Test _PTC (Processor Throttling Control). method PASSED: Test 89, \_PR_.CPU0._PTC correctly returned a sane method looking package. method PASSED: Test 89, \_PR_.CPU1._PTC correctly returned a sane method looking package. method -method Test 90 of 195: Test _TDL (T-State Depth Limit). +method Test 90 of 189: Test _TDL (T-State Depth Limit). method SKIPPED: Test 90, Skipping test for non-existant object method _TDL. method -method Test 91 of 195: Test _TPC (Throttling Present +method Test 91 of 189: Test _TPC (Throttling Present method Capabilities). method PASSED: Test 91, \_PR_.CPU0._TPC correctly returned an method integer. method PASSED: Test 91, \_PR_.CPU1._TPC correctly returned an method integer. method -method Test 92 of 195: Test _TSD (Throttling State Dependencies). +method Test 92 of 189: Test _TSD (Throttling State Dependencies). method PASSED: Test 92, \_PR_.CPU0._TSD correctly returned a sane method looking package. method PASSED: Test 92, \_PR_.CPU1._TSD correctly returned a sane method looking package. method -method Test 93 of 195: Test _TSS (Throttling Supported States). +method Test 93 of 189: Test _TSS (Throttling Supported States). method \_PR_.CPU0._TSS values: method T-State CPU Power Latency Control Status method Freq (mW) (usecs) @@ -650,53 +650,53 @@ method PASSED: Test 93, \_PR_.CPU1._TSS correctly returned a sane method looking package. method -method Test 94 of 195: Test _LPI (Low Power Idle States). +method Test 94 of 189: Test _LPI (Low Power Idle States). method SKIPPED: Test 94, Skipping test for non-existant object method _LPI. method -method Test 95 of 195: Test _RDI (Resource Dependencies for +method Test 95 of 189: Test _RDI (Resource Dependencies for method Idle). method SKIPPED: Test 95, Skipping test for non-existant object method _RDI. method -method Test 96 of 195: Test _PUR (Processor Utilization Request). +method Test 96 of 189: Test _PUR (Processor Utilization Request). method SKIPPED: Test 96, Skipping test for non-existant object method _PUR. method -method Test 97 of 195: Test _MSG (Message). +method Test 97 of 189: Test _MSG (Message). method SKIPPED: Test 97, Skipping test for non-existant object method _MSG. method -method Test 98 of 195: Test _SST (System Status). +method Test 98 of 189: Test _SST (System Status). method SKIPPED: Test 98, Skipping test for non-existant object method _SST. method -method Test 99 of 195: Test _ALC (Ambient Light Colour +method Test 99 of 189: Test _ALC (Ambient Light Colour method Chromaticity). method SKIPPED: Test 99, Skipping test for non-existant object method _ALC. method -method Test 100 of 195: Test _ALI (Ambient Light Illuminance). +method Test 100 of 189: Test _ALI (Ambient Light Illuminance). method SKIPPED: Test 100, Skipping test for non-existant object method _ALI. method -method Test 101 of 195: Test _ALT (Ambient Light Temperature). +method Test 101 of 189: Test _ALT (Ambient Light Temperature). method SKIPPED: Test 101, Skipping test for non-existant object method _ALT. method -method Test 102 of 195: Test _ALP (Ambient Light Polling). +method Test 102 of 189: Test _ALP (Ambient Light Polling). method SKIPPED: Test 102, Skipping test for non-existant object method _ALP. method -method Test 103 of 195: Test _ALR (Ambient Light Response). +method Test 103 of 189: Test _ALR (Ambient Light Response). method SKIPPED: Test 103, Skipping test for non-existant object method _ALR. method -method Test 104 of 195: Test _LID (Lid Status). +method Test 104 of 189: Test _LID (Lid Status). method PASSED: Test 104, \_SB_.LID0._LID correctly returned sane method looking value 0x00000000. method -method Test 105 of 195: Test _GTF (Get Task File). +method Test 105 of 189: Test _GTF (Get Task File). method PASSED: Test 105, \_SB_.PCI0.PATA.PRID.P_D0._GTF correctly method returned a sane looking buffer. method PASSED: Test 105, \_SB_.PCI0.PATA.PRID.P_D1._GTF correctly @@ -711,165 +711,165 @@ method \_SB_.PCI0.SATA.PRT2._GTF should return a buffer with size method of multiple of 7. method -method Test 106 of 195: Test _GTM (Get Timing Mode). +method Test 106 of 189: Test _GTM (Get Timing Mode). method PASSED: Test 106, \_SB_.PCI0.PATA.PRID._GTM correctly method returned a sane looking buffer. method -method Test 107 of 195: Test _MBM (Memory Bandwidth Monitoring +method Test 107 of 189: Test _MBM (Memory Bandwidth Monitoring method Data). method SKIPPED: Test 107, Skipping test for non-existant object method _MBM. method -method Test 108 of 195: Test _UPC (USB Port Capabilities). +method Test 108 of 189: Test _UPC (USB Port Capabilities). method SKIPPED: Test 108, Skipping test for non-existant object method _UPC. method -method Test 109 of 195: Test _UPD (User Presence Detect). +method Test 109 of 189: Test _UPD (User Presence Detect). method SKIPPED: Test 109, Skipping test for non-existant object method _UPD. method -method Test 110 of 195: Test _UPP (User Presence Polling). +method Test 110 of 189: Test _UPP (User Presence Polling). method SKIPPED: Test 110, Skipping test for non-existant object method _UPP. method -method Test 111 of 195: Test _GCP (Get Capabilities). +method Test 111 of 189: Test _GCP (Get Capabilities). method SKIPPED: Test 111, Skipping test for non-existant object method _GCP. method -method Test 112 of 195: Test _GRT (Get Real Time). +method Test 112 of 189: Test _GRT (Get Real Time). method SKIPPED: Test 112, Skipping test for non-existant object method _GRT. method -method Test 113 of 195: Test _GWS (Get Wake Status). +method Test 113 of 189: Test _GWS (Get Wake Status). method SKIPPED: Test 113, Skipping test for non-existant object method _GWS. method -method Test 114 of 195: Test _CWS (Clear Wake Status). +method Test 114 of 189: Test _CWS (Clear Wake Status). method SKIPPED: Test 114, Skipping test for non-existant object method _CWS. method -method Test 115 of 195: Test _STP (Set Expired Timer Wake +method Test 115 of 189: Test _STP (Set Expired Timer Wake method Policy). method SKIPPED: Test 115, Skipping test for non-existant object method _STP. method -method Test 116 of 195: Test _STV (Set Timer Value). +method Test 116 of 189: Test _STV (Set Timer Value). method SKIPPED: Test 116, Skipping test for non-existant object method _STV. method -method Test 117 of 195: Test _TIP (Expired Timer Wake Policy). +method Test 117 of 189: Test _TIP (Expired Timer Wake Policy). method SKIPPED: Test 117, Skipping test for non-existant object method _TIP. method -method Test 118 of 195: Test _TIV (Timer Values). +method Test 118 of 189: Test _TIV (Timer Values). method SKIPPED: Test 118, Skipping test for non-existant object method _TIV. method -method Test 119 of 195: Test _SBS (Smart Battery Subsystem). +method Test 119 of 189: Test _SBS (Smart Battery Subsystem). method SKIPPED: Test 119, Skipping test for non-existant object method _SBS. method -method Test 120 of 195: Test _BCT (Battery Charge Time). +method Test 120 of 189: Test _BCT (Battery Charge Time). method SKIPPED: Test 120, Skipping test for non-existant object method _BCT. method -method Test 121 of 195: Test _BIF (Battery Information). +method Test 121 of 189: Test _BIF (Battery Information). method PASSED: Test 121, \_SB_.PCI0.LPCB.BAT1._BIF correctly method returned a sane looking package. method -method Test 122 of 195: Test _BIX (Battery Information Extended). +method Test 122 of 189: Test _BIX (Battery Information Extended). method SKIPPED: Test 122, Skipping test for non-existant object method _BIX. method -method Test 123 of 195: Test _BMA (Battery Measurement +method Test 123 of 189: Test _BMA (Battery Measurement method Averaging). method SKIPPED: Test 123, Skipping test for non-existant object method _BMA. method -method Test 124 of 195: Test _BMC (Battery Maintenance Control). +method Test 124 of 189: Test _BMC (Battery Maintenance Control). method SKIPPED: Test 124, Skipping test for non-existant object method _BMC. method -method Test 125 of 195: Test _BMD (Battery Maintenance Data). +method Test 125 of 189: Test _BMD (Battery Maintenance Data). method SKIPPED: Test 125, Skipping test for non-existant object method _BMD. method -method Test 126 of 195: Test _BMS (Battery Measurement Sampling +method Test 126 of 189: Test _BMS (Battery Measurement Sampling method Time). method SKIPPED: Test 126, Skipping test for non-existant object method _BMS. method -method Test 127 of 195: Test _BST (Battery Status). +method Test 127 of 189: Test _BST (Battery Status). method PASSED: Test 127, \_SB_.PCI0.LPCB.BAT1._BST correctly method returned a sane looking package. method -method Test 128 of 195: Test _BTP (Battery Trip Point). +method Test 128 of 189: Test _BTP (Battery Trip Point). method SKIPPED: Test 128, Skipping test for non-existant object method _BTP. method -method Test 129 of 195: Test _BTH (Battery Throttle Limit). +method Test 129 of 189: Test _BTH (Battery Throttle Limit). method SKIPPED: Test 129, Skipping test for non-existant object method _BTH. method -method Test 130 of 195: Test _BTM (Battery Time). +method Test 130 of 189: Test _BTM (Battery Time). method SKIPPED: Test 130, Skipping test for non-existant object method _BTM. method -method Test 131 of 195: Test _PCL (Power Consumer List). +method Test 131 of 189: Test _PCL (Power Consumer List). method PASSED: Test 131, \_SB_.PCI0.LPCB.ACAD._PCL returned a method sane package of 1 references. method PASSED: Test 131, \_SB_.PCI0.LPCB.BAT1._PCL returned a method sane package of 1 references. method -method Test 132 of 195: Test _PIF (Power Source Information). +method Test 132 of 189: Test _PIF (Power Source Information). method SKIPPED: Test 132, Skipping test for non-existant object method _PIF. method -method Test 133 of 195: Test _PRL (Power Source Redundancy List). +method Test 133 of 189: Test _PRL (Power Source Redundancy List). method SKIPPED: Test 133, Skipping test for non-existant object method _PRL. method -method Test 134 of 195: Test _PSR (Power Source). +method Test 134 of 189: Test _PSR (Power Source). method PASSED: Test 134, \_SB_.PCI0.LPCB.ACAD._PSR correctly method returned sane looking value 0x00000000. method -method Test 135 of 195: Test _GAI (Get Averaging Level). +method Test 135 of 189: Test _GAI (Get Averaging Level). method SKIPPED: Test 135, Skipping test for non-existant object method _GAI. method -method Test 136 of 195: Test _GHL (Get Harware Limit). +method Test 136 of 189: Test _GHL (Get Harware Limit). method SKIPPED: Test 136, Skipping test for non-existant object method _GHL. method -method Test 137 of 195: Test _PMC (Power Meter Capabilities). +method Test 137 of 189: Test _PMC (Power Meter Capabilities). method SKIPPED: Test 137, Skipping test for non-existant object method _PMC. method -method Test 138 of 195: Test _PMD (Power Meter Devices). +method Test 138 of 189: Test _PMD (Power Meter Devices). method SKIPPED: Test 138, Skipping test for non-existant object method _PMD. method -method Test 139 of 195: Test _PMM (Power Meter Measurement). +method Test 139 of 189: Test _PMM (Power Meter Measurement). method SKIPPED: Test 139, Skipping test for non-existant object method _PMM. method -method Test 140 of 195: Test _FIF (Fan Information). +method Test 140 of 189: Test _FIF (Fan Information). method SKIPPED: Test 140, Skipping test for non-existant object method _FIF. method -method Test 141 of 195: Test _FPS (Fan Performance States). +method Test 141 of 189: Test _FPS (Fan Performance States). method SKIPPED: Test 141, Skipping test for non-existant object method _FPS. method -method Test 142 of 195: Test _FSL (Fan Set Level). +method Test 142 of 189: Test _FSL (Fan Set Level). method SKIPPED: Test 142, Skipping test for non-existant object method _FSL. method -method Test 143 of 195: Test _FST (Fan Status). +method Test 143 of 189: Test _FST (Fan Status). method SKIPPED: Test 143, Skipping test for non-existant object method _FST. method -method Test 144 of 195: Test _ACx (Active Cooling). +method Test 144 of 189: Test _ACx (Active Cooling). method SKIPPED: Test 144, Skipping test for non-existant object method _AC0. method @@ -901,109 +901,109 @@ method _AC9. method method -method Test 145 of 195: Test _ART (Active Cooling Relationship +method Test 145 of 189: Test _ART (Active Cooling Relationship method Table). method SKIPPED: Test 145, Skipping test for non-existant object method _ART. method -method Test 146 of 195: Test _CRT (Critical Trip Point). +method Test 146 of 189: Test _CRT (Critical Trip Point). method SKIPPED: Test 146, Skipping test for non-existant object method _CRT. method -method Test 147 of 195: Test _CR3 (Warm/Standby Temperature). +method Test 147 of 189: Test _CR3 (Warm/Standby Temperature). method SKIPPED: Test 147, Skipping test for non-existant object method _CR3. method -method Test 148 of 195: Test _DTI (Device Temperature +method Test 148 of 189: Test _DTI (Device Temperature method Indication). method SKIPPED: Test 148, Skipping test for non-existant object method _DTI. method -method Test 149 of 195: Test _HOT (Hot Temperature). +method Test 149 of 189: Test _HOT (Hot Temperature). method SKIPPED: Test 149, Skipping test for non-existant object method _HOT. method -method Test 150 of 195: Test _MTL (Minimum Throttle Limit). +method Test 150 of 189: Test _MTL (Minimum Throttle Limit). method SKIPPED: Test 150, Skipping test for non-existant object method _MTL. method -method Test 151 of 195: Test _NTT (Notification Temp Threshold). +method Test 151 of 189: Test _NTT (Notification Temp Threshold). method SKIPPED: Test 151, Skipping test for non-existant object method _NTT. method -method Test 152 of 195: Test _PSL (Passive List). +method Test 152 of 189: Test _PSL (Passive List). method SKIPPED: Test 152, Skipping test for non-existant object method _PSL. method -method Test 153 of 195: Test _PSV (Passive Temp). +method Test 153 of 189: Test _PSV (Passive Temp). method SKIPPED: Test 153, Skipping test for non-existant object method _PSV. method -method Test 154 of 195: Test _RTV (Relative Temp Values). +method Test 154 of 189: Test _RTV (Relative Temp Values). method SKIPPED: Test 154, Skipping test for non-existant object method _RTV. method -method Test 155 of 195: Test _SCP (Set Cooling Policy). +method Test 155 of 189: Test _SCP (Set Cooling Policy). method SKIPPED: Test 155, Skipping test for non-existant object method _DTI. method -method Test 156 of 195: Test _TC1 (Thermal Constant 1). +method Test 156 of 189: Test _TC1 (Thermal Constant 1). method SKIPPED: Test 156, Skipping test for non-existant object method _TC1. method -method Test 157 of 195: Test _TC2 (Thermal Constant 2). +method Test 157 of 189: Test _TC2 (Thermal Constant 2). method SKIPPED: Test 157, Skipping test for non-existant object method _TC2. method -method Test 158 of 195: Test _TFP (Thermal fast Sampling Period). +method Test 158 of 189: Test _TFP (Thermal fast Sampling Period). method SKIPPED: Test 158, Skipping test for non-existant object method _TFP. method -method Test 159 of 195: Test _TMP (Thermal Zone Current Temp). +method Test 159 of 189: Test _TMP (Thermal Zone Current Temp). method SKIPPED: Test 159, Skipping test for non-existant object method _TMP. method -method Test 160 of 195: Test _TPT (Trip Point Temperature). +method Test 160 of 189: Test _TPT (Trip Point Temperature). method SKIPPED: Test 160, Skipping test for non-existant object method _TPT. method -method Test 161 of 195: Test _TRT (Thermal Relationship Table). +method Test 161 of 189: Test _TRT (Thermal Relationship Table). method SKIPPED: Test 161, Skipping test for non-existant object method _TRT. method -method Test 162 of 195: Test _TSN (Thermal Sensor Device). +method Test 162 of 189: Test _TSN (Thermal Sensor Device). method SKIPPED: Test 162, Skipping test for non-existant object method _TSN. method -method Test 163 of 195: Test _TSP (Thermal Sampling Period). +method Test 163 of 189: Test _TSP (Thermal Sampling Period). method SKIPPED: Test 163, Skipping test for non-existant object method _TSP. method -method Test 164 of 195: Test _TST (Temperature Sensor Threshold). +method Test 164 of 189: Test _TST (Temperature Sensor Threshold). method SKIPPED: Test 164, Skipping test for non-existant object method _TST. method -method Test 165 of 195: Test _TZD (Thermal Zone Devices). +method Test 165 of 189: Test _TZD (Thermal Zone Devices). method SKIPPED: Test 165, Skipping test for non-existant object method _TZD. method -method Test 166 of 195: Test _TZM (Thermal Zone member). +method Test 166 of 189: Test _TZM (Thermal Zone member). method SKIPPED: Test 166, Skipping test for non-existant object method _TZM. method -method Test 167 of 195: Test _TZP (Thermal Zone Polling). +method Test 167 of 189: Test _TZP (Thermal Zone Polling). method SKIPPED: Test 167, Skipping test for non-existant object method _TZP. method -method Test 168 of 195: Test _GPE (General Purpose Events). +method Test 168 of 189: Test _GPE (General Purpose Events). method PASSED: Test 168, \_SB_.PCI0.LPCB.EC0_._GPE returned an method integer 0x0000001c method -method Test 169 of 195: Test _EC (EC Offset Query). +method Test 169 of 189: Test _EC_ (EC Offset Query). method SKIPPED: Test 169, Skipping test for non-existant object -method _EC. +method _EC_. method -method Test 170 of 195: Test _PTS (Prepare to Sleep). +method Test 170 of 189: Test _PTS (Prepare to Sleep). method Test _PTS(1). method PASSED: Test 170, \_PTS returned no values as expected. method @@ -1020,257 +1020,233 @@ method PASSED: Test 170, \_PTS returned no values as expected. method method -method Test 171 of 195: Test _TTS (Transition to State). +method Test 171 of 189: Test _TTS (Transition to State). method SKIPPED: Test 171, Optional control method _TTS does not method exist. method -method Test 172 of 195: Test _S0 (System S0 State). -method SKIPPED: Test 172, Skipping test for non-existant object -method _S0. -method -method Test 173 of 195: Test _S1 (System S1 State). -method SKIPPED: Test 173, Skipping test for non-existant object -method _S1. -method -method Test 174 of 195: Test _S2 (System S2 State). -method SKIPPED: Test 174, Skipping test for non-existant object -method _S2. -method -method Test 175 of 195: Test _S3 (System S3 State). -method SKIPPED: Test 175, Skipping test for non-existant object -method _S3. -method -method Test 176 of 195: Test _S4 (System S4 State). -method SKIPPED: Test 176, Skipping test for non-existant object -method _S4. -method -method Test 177 of 195: Test _S5 (System S5 State). -method SKIPPED: Test 177, Skipping test for non-existant object -method _S5. -method -method Test 178 of 195: Test _WAK (System Wake). +method Test 172 of 189: Test _WAK (System Wake). method Test _WAK(1) System Wake, State S1. -method PASSED: Test 178, \_WAK correctly returned a sane looking +method PASSED: Test 172, \_WAK correctly returned a sane looking method package. method method Test _WAK(2) System Wake, State S2. -method PASSED: Test 178, \_WAK correctly returned a sane looking +method PASSED: Test 172, \_WAK correctly returned a sane looking method package. method method Test _WAK(3) System Wake, State S3. -method PASSED: Test 178, \_WAK correctly returned a sane looking +method PASSED: Test 172, \_WAK correctly returned a sane looking method package. method method Test _WAK(4) System Wake, State S4. -method PASSED: Test 178, \_WAK correctly returned a sane looking +method PASSED: Test 172, \_WAK correctly returned a sane looking method package. method method Test _WAK(5) System Wake, State S5. -method PASSED: Test 178, \_WAK correctly returned a sane looking +method PASSED: Test 172, \_WAK correctly returned a sane looking method package. method method -method Test 179 of 195: Test _ADR (Return Unique ID for Device). -method PASSED: Test 179, \_SB_.PCI0.MCHC._ADR correctly returned +method Test 173 of 189: Test _ADR (Return Unique ID for Device). +method PASSED: Test 173, \_SB_.PCI0.MCHC._ADR correctly returned method an integer. -method PASSED: Test 179, \_SB_.PCI0.PEGP._ADR correctly returned +method PASSED: Test 173, \_SB_.PCI0.PEGP._ADR correctly returned method an integer. -method PASSED: Test 179, \_SB_.PCI0.PEGP.VGA_._ADR correctly +method PASSED: Test 173, \_SB_.PCI0.PEGP.VGA_._ADR correctly method returned an integer. -method PASSED: Test 179, \_SB_.PCI0.PEGP.VGA_.CRT_._ADR correctly +method PASSED: Test 173, \_SB_.PCI0.PEGP.VGA_.CRT_._ADR correctly method returned an integer. -method PASSED: Test 179, \_SB_.PCI0.PEGP.VGA_.LCD_._ADR correctly +method PASSED: Test 173, \_SB_.PCI0.PEGP.VGA_.LCD_._ADR correctly method returned an integer. -method PASSED: Test 179, \_SB_.PCI0.PEGP.VGA_.TV__._ADR correctly +method PASSED: Test 173, \_SB_.PCI0.PEGP.VGA_.TV__._ADR correctly method returned an integer. -method PASSED: Test 179, \_SB_.PCI0.GFX0._ADR correctly returned +method PASSED: Test 173, \_SB_.PCI0.GFX0._ADR correctly returned method an integer. -method PASSED: Test 179, \_SB_.PCI0.GFX0.DD01._ADR correctly +method PASSED: Test 173, \_SB_.PCI0.GFX0.DD01._ADR correctly method returned an integer. -method PASSED: Test 179, \_SB_.PCI0.GFX0.DD02._ADR correctly +method PASSED: Test 173, \_SB_.PCI0.GFX0.DD02._ADR correctly method returned an integer. -method PASSED: Test 179, \_SB_.PCI0.GFX0.DD03._ADR correctly +method PASSED: Test 173, \_SB_.PCI0.GFX0.DD03._ADR correctly method returned an integer. -method PASSED: Test 179, \_SB_.PCI0.GFX0.DD04._ADR correctly +method PASSED: Test 173, \_SB_.PCI0.GFX0.DD04._ADR correctly method returned an integer. -method PASSED: Test 179, \_SB_.PCI0.GFX0.DD05._ADR correctly +method PASSED: Test 173, \_SB_.PCI0.GFX0.DD05._ADR correctly method returned an integer. -method PASSED: Test 179, \_SB_.PCI0.HDEF._ADR correctly returned +method PASSED: Test 173, \_SB_.PCI0.HDEF._ADR correctly returned method an integer. -method PASSED: Test 179, \_SB_.PCI0.RP01._ADR correctly returned +method PASSED: Test 173, \_SB_.PCI0.RP01._ADR correctly returned method an integer. -method PASSED: Test 179, \_SB_.PCI0.RP01.PXSX._ADR correctly +method PASSED: Test 173, \_SB_.PCI0.RP01.PXSX._ADR correctly method returned an integer. -method PASSED: Test 179, \_SB_.PCI0.RP02._ADR correctly returned +method PASSED: Test 173, \_SB_.PCI0.RP02._ADR correctly returned method an integer. -method PASSED: Test 179, \_SB_.PCI0.RP02.PXSX._ADR correctly +method PASSED: Test 173, \_SB_.PCI0.RP02.PXSX._ADR correctly method returned an integer. -method PASSED: Test 179, \_SB_.PCI0.RP03._ADR correctly returned +method PASSED: Test 173, \_SB_.PCI0.RP03._ADR correctly returned method an integer. -method PASSED: Test 179, \_SB_.PCI0.RP03.PXSX._ADR correctly +method PASSED: Test 173, \_SB_.PCI0.RP03.PXSX._ADR correctly method returned an integer. -method PASSED: Test 179, \_SB_.PCI0.RP04._ADR correctly returned +method PASSED: Test 173, \_SB_.PCI0.RP04._ADR correctly returned method an integer. -method PASSED: Test 179, \_SB_.PCI0.RP04.PXSX._ADR correctly +method PASSED: Test 173, \_SB_.PCI0.RP04.PXSX._ADR correctly method returned an integer. -method PASSED: Test 179, \_SB_.PCI0.RP05._ADR correctly returned +method PASSED: Test 173, \_SB_.PCI0.RP05._ADR correctly returned method an integer. -method PASSED: Test 179, \_SB_.PCI0.RP05.PXSX._ADR correctly +method PASSED: Test 173, \_SB_.PCI0.RP05.PXSX._ADR correctly method returned an integer. -method PASSED: Test 179, \_SB_.PCI0.RP06._ADR correctly returned +method PASSED: Test 173, \_SB_.PCI0.RP06._ADR correctly returned method an integer. -method PASSED: Test 179, \_SB_.PCI0.RP06.PXSX._ADR correctly +method PASSED: Test 173, \_SB_.PCI0.RP06.PXSX._ADR correctly method returned an integer. -method PASSED: Test 179, \_SB_.PCI0.USB1._ADR correctly returned +method PASSED: Test 173, \_SB_.PCI0.USB1._ADR correctly returned method an integer. -method PASSED: Test 179, \_SB_.PCI0.USB2._ADR correctly returned +method PASSED: Test 173, \_SB_.PCI0.USB2._ADR correctly returned method an integer. -method PASSED: Test 179, \_SB_.PCI0.USB3._ADR correctly returned +method PASSED: Test 173, \_SB_.PCI0.USB3._ADR correctly returned method an integer. -method PASSED: Test 179, \_SB_.PCI0.USB4._ADR correctly returned +method PASSED: Test 173, \_SB_.PCI0.USB4._ADR correctly returned method an integer. -method PASSED: Test 179, \_SB_.PCI0.USB5._ADR correctly returned +method PASSED: Test 173, \_SB_.PCI0.USB5._ADR correctly returned method an integer. -method PASSED: Test 179, \_SB_.PCI0.EHC1._ADR correctly returned +method PASSED: Test 173, \_SB_.PCI0.EHC1._ADR correctly returned method an integer. -method PASSED: Test 179, \_SB_.PCI0.EHC1.HUB7._ADR correctly +method PASSED: Test 173, \_SB_.PCI0.EHC1.HUB7._ADR correctly method returned an integer. -method PASSED: Test 179, \_SB_.PCI0.EHC1.HUB7.PRT1._ADR correctly +method PASSED: Test 173, \_SB_.PCI0.EHC1.HUB7.PRT1._ADR correctly method returned an integer. -method PASSED: Test 179, \_SB_.PCI0.EHC1.HUB7.PRT2._ADR correctly +method PASSED: Test 173, \_SB_.PCI0.EHC1.HUB7.PRT2._ADR correctly method returned an integer. -method PASSED: Test 179, \_SB_.PCI0.EHC1.HUB7.PRT3._ADR correctly +method PASSED: Test 173, \_SB_.PCI0.EHC1.HUB7.PRT3._ADR correctly method returned an integer. -method PASSED: Test 179, \_SB_.PCI0.EHC1.HUB7.PRT4._ADR correctly +method PASSED: Test 173, \_SB_.PCI0.EHC1.HUB7.PRT4._ADR correctly method returned an integer. -method PASSED: Test 179, \_SB_.PCI0.EHC1.HUB7.PRT5._ADR correctly +method PASSED: Test 173, \_SB_.PCI0.EHC1.HUB7.PRT5._ADR correctly method returned an integer. -method PASSED: Test 179, \_SB_.PCI0.EHC1.HUB7.PRT6._ADR correctly +method PASSED: Test 173, \_SB_.PCI0.EHC1.HUB7.PRT6._ADR correctly method returned an integer. -method PASSED: Test 179, \_SB_.PCI0.EHC2._ADR correctly returned +method PASSED: Test 173, \_SB_.PCI0.EHC2._ADR correctly returned method an integer. -method PASSED: Test 179, \_SB_.PCI0.EHC2.HUB7._ADR correctly +method PASSED: Test 173, \_SB_.PCI0.EHC2.HUB7._ADR correctly method returned an integer. -method PASSED: Test 179, \_SB_.PCI0.EHC2.HUB7.PRT1._ADR correctly +method PASSED: Test 173, \_SB_.PCI0.EHC2.HUB7.PRT1._ADR correctly method returned an integer. -method PASSED: Test 179, \_SB_.PCI0.EHC2.HUB7.PRT2._ADR correctly +method PASSED: Test 173, \_SB_.PCI0.EHC2.HUB7.PRT2._ADR correctly method returned an integer. -method PASSED: Test 179, \_SB_.PCI0.EHC2.HUB7.PRT3._ADR correctly +method PASSED: Test 173, \_SB_.PCI0.EHC2.HUB7.PRT3._ADR correctly method returned an integer. -method PASSED: Test 179, \_SB_.PCI0.EHC2.HUB7.PRT4._ADR correctly +method PASSED: Test 173, \_SB_.PCI0.EHC2.HUB7.PRT4._ADR correctly method returned an integer. -method PASSED: Test 179, \_SB_.PCI0.PCIB._ADR correctly returned +method PASSED: Test 173, \_SB_.PCI0.PCIB._ADR correctly returned method an integer. -method PASSED: Test 179, \_SB_.PCI0.LPCB._ADR correctly returned +method PASSED: Test 173, \_SB_.PCI0.LPCB._ADR correctly returned method an integer. -method PASSED: Test 179, \_SB_.PCI0.PATA._ADR correctly returned +method PASSED: Test 173, \_SB_.PCI0.PATA._ADR correctly returned method an integer. -method PASSED: Test 179, \_SB_.PCI0.PATA.PRID._ADR correctly +method PASSED: Test 173, \_SB_.PCI0.PATA.PRID._ADR correctly method returned an integer. -method PASSED: Test 179, \_SB_.PCI0.PATA.PRID.P_D0._ADR correctly +method PASSED: Test 173, \_SB_.PCI0.PATA.PRID.P_D0._ADR correctly method returned an integer. -method PASSED: Test 179, \_SB_.PCI0.PATA.PRID.P_D1._ADR correctly +method PASSED: Test 173, \_SB_.PCI0.PATA.PRID.P_D1._ADR correctly method returned an integer. -method PASSED: Test 179, \_SB_.PCI0.SATA._ADR correctly returned +method PASSED: Test 173, \_SB_.PCI0.SATA._ADR correctly returned method an integer. -method PASSED: Test 179, \_SB_.PCI0.SATA.PRT0._ADR correctly +method PASSED: Test 173, \_SB_.PCI0.SATA.PRT0._ADR correctly method returned an integer. -method PASSED: Test 179, \_SB_.PCI0.SATA.PRT1._ADR correctly +method PASSED: Test 173, \_SB_.PCI0.SATA.PRT1._ADR correctly method returned an integer. -method PASSED: Test 179, \_SB_.PCI0.SATA.PRT2._ADR correctly +method PASSED: Test 173, \_SB_.PCI0.SATA.PRT2._ADR correctly method returned an integer. -method PASSED: Test 179, \_SB_.PCI0.SBUS._ADR correctly returned +method PASSED: Test 173, \_SB_.PCI0.SBUS._ADR correctly returned method an integer. method -method Test 180 of 195: Test _BCL (Query List of Brightness +method Test 174 of 189: Test _BCL (Query List of Brightness method Control Levels Supported). method Brightness levels for \_SB_.PCI0.PEGP.VGA_.LCD_._BCL: method Level on full power : 70 method Level on battery power: 40 method Brightness Levels : 0, 10, 20, 30, 40, 50, 60, 70 -method PASSED: Test 180, \_SB_.PCI0.PEGP.VGA_.LCD_._BCL returned +method PASSED: Test 174, \_SB_.PCI0.PEGP.VGA_.LCD_._BCL returned method a sane package of 10 integers. method Brightness levels for \_SB_.PCI0.GFX0.DD03._BCL: method Level on full power : 70 method Level on battery power: 40 method Brightness Levels : 0, 10, 20, 30, 40, 50, 60, 70 -method PASSED: Test 180, \_SB_.PCI0.GFX0.DD03._BCL returned a +method PASSED: Test 174, \_SB_.PCI0.GFX0.DD03._BCL returned a method sane package of 10 integers. method -method Test 181 of 195: Test _BCM (Set Brightness Level). -method PASSED: Test 181, \_SB_.PCI0.PEGP.VGA_.LCD_._BCM returned +method Test 175 of 189: Test _BCM (Set Brightness Level). +method PASSED: Test 175, \_SB_.PCI0.PEGP.VGA_.LCD_._BCM returned method no values as expected. -method PASSED: Test 181, \_SB_.PCI0.GFX0.DD03._BCM returned no +method PASSED: Test 175, \_SB_.PCI0.GFX0.DD03._BCM returned no method values as expected. method -method Test 182 of 195: Test _BQC (Brightness Query Current +method Test 176 of 189: Test _BQC (Brightness Query Current method Level). -method PASSED: Test 182, \_SB_.PCI0.PEGP.VGA_.LCD_._BQC correctly +method PASSED: Test 176, \_SB_.PCI0.PEGP.VGA_.LCD_._BQC correctly method returned an integer. -method PASSED: Test 182, \_SB_.PCI0.GFX0.DD03._BQC correctly +method PASSED: Test 176, \_SB_.PCI0.GFX0.DD03._BQC correctly method returned an integer. method -method Test 183 of 195: Test _DCS (Return the Status of Output +method Test 177 of 189: Test _DCS (Return the Status of Output method Device). -method PASSED: Test 183, \_SB_.PCI0.PEGP.VGA_.CRT_._DCS correctly +method PASSED: Test 177, \_SB_.PCI0.PEGP.VGA_.CRT_._DCS correctly method returned an integer. -method PASSED: Test 183, \_SB_.PCI0.PEGP.VGA_.LCD_._DCS correctly +method PASSED: Test 177, \_SB_.PCI0.PEGP.VGA_.LCD_._DCS correctly method returned an integer. -method PASSED: Test 183, \_SB_.PCI0.PEGP.VGA_.TV__._DCS correctly +method PASSED: Test 177, \_SB_.PCI0.PEGP.VGA_.TV__._DCS correctly method returned an integer. -method PASSED: Test 183, \_SB_.PCI0.GFX0.DD01._DCS correctly +method PASSED: Test 177, \_SB_.PCI0.GFX0.DD01._DCS correctly method returned an integer. -method PASSED: Test 183, \_SB_.PCI0.GFX0.DD02._DCS correctly +method PASSED: Test 177, \_SB_.PCI0.GFX0.DD02._DCS correctly method returned an integer. -method PASSED: Test 183, \_SB_.PCI0.GFX0.DD03._DCS correctly +method PASSED: Test 177, \_SB_.PCI0.GFX0.DD03._DCS correctly method returned an integer. -method PASSED: Test 183, \_SB_.PCI0.GFX0.DD04._DCS correctly +method PASSED: Test 177, \_SB_.PCI0.GFX0.DD04._DCS correctly method returned an integer. -method PASSED: Test 183, \_SB_.PCI0.GFX0.DD05._DCS correctly +method PASSED: Test 177, \_SB_.PCI0.GFX0.DD05._DCS correctly method returned an integer. method -method Test 184 of 195: Test _DDC (Return the EDID for this +method Test 178 of 189: Test _DDC (Return the EDID for this method Device). -method SKIPPED: Test 184, Skipping test for non-existant object +method SKIPPED: Test 178, Skipping test for non-existant object method _DDC. method -method Test 185 of 195: Test _DSS (Device Set State). -method PASSED: Test 185, \_SB_.PCI0.PEGP.VGA_.CRT_._DSS returned +method Test 179 of 189: Test _DSS (Device Set State). +method PASSED: Test 179, \_SB_.PCI0.PEGP.VGA_.CRT_._DSS returned method no values as expected. -method PASSED: Test 185, \_SB_.PCI0.PEGP.VGA_.LCD_._DSS returned +method PASSED: Test 179, \_SB_.PCI0.PEGP.VGA_.LCD_._DSS returned method no values as expected. -method PASSED: Test 185, \_SB_.PCI0.PEGP.VGA_.TV__._DSS returned +method PASSED: Test 179, \_SB_.PCI0.PEGP.VGA_.TV__._DSS returned method no values as expected. -method PASSED: Test 185, \_SB_.PCI0.GFX0.DD01._DSS returned no +method PASSED: Test 179, \_SB_.PCI0.GFX0.DD01._DSS returned no method values as expected. -method PASSED: Test 185, \_SB_.PCI0.GFX0.DD02._DSS returned no +method PASSED: Test 179, \_SB_.PCI0.GFX0.DD02._DSS returned no method values as expected. -method PASSED: Test 185, \_SB_.PCI0.GFX0.DD03._DSS returned no +method PASSED: Test 179, \_SB_.PCI0.GFX0.DD03._DSS returned no method values as expected. -method PASSED: Test 185, \_SB_.PCI0.GFX0.DD04._DSS returned no +method PASSED: Test 179, \_SB_.PCI0.GFX0.DD04._DSS returned no method values as expected. -method PASSED: Test 185, \_SB_.PCI0.GFX0.DD05._DSS returned no +method PASSED: Test 179, \_SB_.PCI0.GFX0.DD05._DSS returned no method values as expected. method -method Test 186 of 195: Test _DGS (Query Graphics State). -method PASSED: Test 186, \_SB_.PCI0.PEGP.VGA_.CRT_._DGS correctly +method Test 180 of 189: Test _DGS (Query Graphics State). +method PASSED: Test 180, \_SB_.PCI0.PEGP.VGA_.CRT_._DGS correctly method returned an integer. -method PASSED: Test 186, \_SB_.PCI0.PEGP.VGA_.LCD_._DGS correctly +method PASSED: Test 180, \_SB_.PCI0.PEGP.VGA_.LCD_._DGS correctly method returned an integer. -method PASSED: Test 186, \_SB_.PCI0.PEGP.VGA_.TV__._DGS correctly +method PASSED: Test 180, \_SB_.PCI0.PEGP.VGA_.TV__._DGS correctly method returned an integer. -method PASSED: Test 186, \_SB_.PCI0.GFX0.DD01._DGS correctly +method PASSED: Test 180, \_SB_.PCI0.GFX0.DD01._DGS correctly method returned an integer. -method PASSED: Test 186, \_SB_.PCI0.GFX0.DD02._DGS correctly +method PASSED: Test 180, \_SB_.PCI0.GFX0.DD02._DGS correctly method returned an integer. -method PASSED: Test 186, \_SB_.PCI0.GFX0.DD03._DGS correctly +method PASSED: Test 180, \_SB_.PCI0.GFX0.DD03._DGS correctly method returned an integer. -method PASSED: Test 186, \_SB_.PCI0.GFX0.DD04._DGS correctly +method PASSED: Test 180, \_SB_.PCI0.GFX0.DD04._DGS correctly method returned an integer. -method PASSED: Test 186, \_SB_.PCI0.GFX0.DD05._DGS correctly +method PASSED: Test 180, \_SB_.PCI0.GFX0.DD05._DGS correctly method returned an integer. method -method Test 187 of 195: Test _DOD (Enumerate All Devices Attached +method Test 181 of 189: Test _DOD (Enumerate All Devices Attached method to Display Adapter). method Device 0: method Instance: 0 @@ -1293,7 +1269,7 @@ method BIOS can detect device: 0 method Non-VGA device: 0 method Head or pipe ID: 0 -method PASSED: Test 187, \_SB_.PCI0.PEGP.VGA_._DOD correctly +method PASSED: Test 181, \_SB_.PCI0.PEGP.VGA_._DOD correctly method returned a sane looking package. method Device 0: method Instance: 0 @@ -1302,45 +1278,45 @@ method BIOS can detect device: 0 method Non-VGA device: 0 method Head or pipe ID: 0 -method PASSED: Test 187, \_SB_.PCI0.GFX0._DOD correctly returned +method PASSED: Test 181, \_SB_.PCI0.GFX0._DOD correctly returned method a sane looking package. method -method Test 188 of 195: Test _DOS (Enable/Disable Output +method Test 182 of 189: Test _DOS (Enable/Disable Output method Switching). -method PASSED: Test 188, \_SB_.PCI0.PEGP.VGA_._DOS returned no +method PASSED: Test 182, \_SB_.PCI0.PEGP.VGA_._DOS returned no method values as expected. -method PASSED: Test 188, \_SB_.PCI0.GFX0._DOS returned no values +method PASSED: Test 182, \_SB_.PCI0.GFX0._DOS returned no values method as expected. method -method Test 189 of 195: Test _GPD (Get POST Device). -method SKIPPED: Test 189, Skipping test for non-existant object +method Test 183 of 189: Test _GPD (Get POST Device). +method SKIPPED: Test 183, Skipping test for non-existant object method _GPD. method -method Test 190 of 195: Test _ROM (Get ROM Data). -method SKIPPED: Test 190, Skipping test for non-existant object +method Test 184 of 189: Test _ROM (Get ROM Data). +method SKIPPED: Test 184, Skipping test for non-existant object method _ROM. method -method Test 191 of 195: Test _SPD (Set POST Device). -method SKIPPED: Test 191, Skipping test for non-existant object +method Test 185 of 189: Test _SPD (Set POST Device). +method SKIPPED: Test 185, Skipping test for non-existant object method _SPD. method -method Test 192 of 195: Test _VPO (Video POST Options). -method SKIPPED: Test 192, Skipping test for non-existant object +method Test 186 of 189: Test _VPO (Video POST Options). +method SKIPPED: Test 186, Skipping test for non-existant object method _VPO. method -method Test 193 of 195: Test _CBA (Configuration Base Address). -method SKIPPED: Test 193, Skipping test for non-existant object +method Test 187 of 189: Test _CBA (Configuration Base Address). +method SKIPPED: Test 187, Skipping test for non-existant object method _CBA. method -method Test 194 of 195: Test _IFT (IPMI Interface Type). -method SKIPPED: Test 194, Skipping test for non-existant object +method Test 188 of 189: Test _IFT (IPMI Interface Type). +method SKIPPED: Test 188, Skipping test for non-existant object method _IFT. method -method Test 195 of 195: Test _SRV (IPMI Interface Revision). -method SKIPPED: Test 195, Skipping test for non-existant object +method Test 189 of 189: Test _SRV (IPMI Interface Revision). +method SKIPPED: Test 189, Skipping test for non-existant object method _SRV. method method ========================================================== -method 261 passed, 3 failed, 0 warning, 0 aborted, 157 skipped, 0 +method 261 passed, 3 failed, 0 warning, 0 aborted, 151 skipped, 0 method info only. method ========================================================== diff -Nru fwts-16.02.00/fwts-test/method-0001/test-0001.sh fwts-16.03.00/fwts-test/method-0001/test-0001.sh --- fwts-16.02.00/fwts-test/method-0001/test-0001.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/method-0001/test-0001.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/method.log.$$ +$FWTS --show-tests | grep method > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/method-0001/acpidump-0001.log method - | grep "^[0-9]*[ ]*method" | cut -c7- > $TMPLOG diff $TMPLOG $FWTSTESTDIR/method-0001/method-0001.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/msdm-0001/test-0001.sh fwts-16.03.00/fwts-test/msdm-0001/test-0001.sh --- fwts-16.02.00/fwts-test/msdm-0001/test-0001.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/msdm-0001/test-0001.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/msdm.log.$$ +$FWTS --show-tests | grep MSDM > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/msdm-0001/acpidump-0001.log msdm - | cut -c7- | grep "^msdm" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/msdm-0001/msdm-0001.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/msdm-0001/test-0002.sh fwts-16.03.00/fwts-test/msdm-0001/test-0002.sh --- fwts-16.02.00/fwts-test/msdm-0001/test-0002.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/msdm-0001/test-0002.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/msdm.log.$$ +$FWTS --show-tests | grep MSDM > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/msdm-0001/acpidump-0002.log msdm - | cut -c7- | grep "^msdm" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/msdm-0001/msdm-0002.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/rsdt-0001/test-0001.sh fwts-16.03.00/fwts-test/rsdt-0001/test-0001.sh --- fwts-16.02.00/fwts-test/rsdt-0001/test-0001.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/rsdt-0001/test-0001.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/rsdt.log.$$ +$FWTS --show-tests | grep RSDT > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/rsdt-0001/acpidump-0001.log rsdt - | cut -c7- | grep "^rsdt" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/rsdt-0001/rsdt-0001.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/sbst-0001/test-0001.sh fwts-16.03.00/fwts-test/sbst-0001/test-0001.sh --- fwts-16.02.00/fwts-test/sbst-0001/test-0001.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/sbst-0001/test-0001.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/sbst.log.$$ +$FWTS --show-tests | grep SBST > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/sbst-0001/acpidump-0001.log sbst - | cut -c7- | grep "^sbst" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/sbst-0001/sbst-0001.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/sbst-0001/test-0002.sh fwts-16.03.00/fwts-test/sbst-0001/test-0002.sh --- fwts-16.02.00/fwts-test/sbst-0001/test-0002.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/sbst-0001/test-0002.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/sbst.log.$$ +$FWTS --show-tests | grep SBST > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/sbst-0001/acpidump-0002.log sbst - | cut -c7- | grep "^sbst" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/sbst-0001/sbst-0002.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/slic-0001/test-0001.sh fwts-16.03.00/fwts-test/slic-0001/test-0001.sh --- fwts-16.02.00/fwts-test/slic-0001/test-0001.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/slic-0001/test-0001.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/slic.log.$$ +$FWTS --show-tests | grep SLIC > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/slic-0001/acpidump-0001.log slic - | cut -c7- | grep "^slic" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/slic-0001/slic-0001.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/slic-0001/test-0002.sh fwts-16.03.00/fwts-test/slic-0001/test-0002.sh --- fwts-16.02.00/fwts-test/slic-0001/test-0002.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/slic-0001/test-0002.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/slic.log.$$ +$FWTS --show-tests | grep SLIC > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/slic-0001/acpidump-0002.log slic - | cut -c7- | grep "^slic" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/slic-0001/slic-0002.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/slit-0001/test-0001.sh fwts-16.03.00/fwts-test/slit-0001/test-0001.sh --- fwts-16.02.00/fwts-test/slit-0001/test-0001.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/slit-0001/test-0001.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/slit.log.$$ +$FWTS --show-tests | grep SLIT > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/slit-0001/acpidump-0001.log slit - | cut -c7- | grep "^slit" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/slit-0001/slit-0001.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/slit-0001/test-0002.sh fwts-16.03.00/fwts-test/slit-0001/test-0002.sh --- fwts-16.02.00/fwts-test/slit-0001/test-0002.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/slit-0001/test-0002.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/slit.log.$$ +$FWTS --show-tests | grep SLIT > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/slit-0001/acpidump-0002.log slit - | cut -c7- | grep "^slit" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/slit-0001/slit-0002.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/spcr-0001/test-0001.sh fwts-16.03.00/fwts-test/spcr-0001/test-0001.sh --- fwts-16.02.00/fwts-test/spcr-0001/test-0001.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/spcr-0001/test-0001.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/spcr.log.$$ +$FWTS --show-tests | grep SPCR > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/spcr-0001/acpidump-0001.log spcr - | cut -c7- | grep "^spcr" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/spcr-0001/spcr-0001.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/spcr-0001/test-0002.sh fwts-16.03.00/fwts-test/spcr-0001/test-0002.sh --- fwts-16.02.00/fwts-test/spcr-0001/test-0002.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/spcr-0001/test-0002.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/spcr.log.$$ +$FWTS --show-tests | grep SPCR > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/spcr-0001/acpidump-0002.log spcr - | cut -c7- | grep "^spcr" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/spcr-0001/spcr-0002.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/srat-0001/test-0001.sh fwts-16.03.00/fwts-test/srat-0001/test-0001.sh --- fwts-16.02.00/fwts-test/srat-0001/test-0001.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/srat-0001/test-0001.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/srat.log.$$ +$FWTS --show-tests | grep SRAT > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/srat-0001/acpidump-0001.log srat - | cut -c7- | grep "^srat" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/srat-0001/srat-0001.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/srat-0001/test-0002.sh fwts-16.03.00/fwts-test/srat-0001/test-0002.sh --- fwts-16.02.00/fwts-test/srat-0001/test-0002.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/srat-0001/test-0002.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/srat.log.$$ +$FWTS --show-tests | grep SRAT > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/srat-0001/acpidump-0002.log srat - | cut -c7- | grep "^srat" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/srat-0001/srat-0002.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/stao-0001/test-0001.sh fwts-16.03.00/fwts-test/stao-0001/test-0001.sh --- fwts-16.02.00/fwts-test/stao-0001/test-0001.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/stao-0001/test-0001.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/stao.log.$$ +$FWTS --show-tests | grep STAO > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/stao-0001/acpidump-0001.log stao - | cut -c7- | grep "^stao" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/stao-0001/stao-0001.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/stao-0001/test-0002.sh fwts-16.03.00/fwts-test/stao-0001/test-0002.sh --- fwts-16.02.00/fwts-test/stao-0001/test-0002.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/stao-0001/test-0002.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/stao.log.$$ +$FWTS --show-tests | grep STAO > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/stao-0001/acpidump-0002.log stao - | cut -c7- | grep "^stao" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/stao-0001/stao-0002.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/syntaxcheck-0001/test-0001.sh fwts-16.03.00/fwts-test/syntaxcheck-0001/test-0001.sh --- fwts-16.02.00/fwts-test/syntaxcheck-0001/test-0001.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/syntaxcheck-0001/test-0001.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/syntaxcheck.log.$$ +$FWTS --show-tests | grep syntaxcheck > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 -j $FWTSTESTDIR/../data --dumpfile=$FWTSTESTDIR/syntaxcheck-0001/acpidump-0001.log syntaxcheck - | grep "^[0-9]*[ ]*syntaxcheck" | cut -c7- > $TMPLOG diff $TMPLOG $FWTSTESTDIR/syntaxcheck-0001/syntaxcheck-0001.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/tcpa-0001/test-0001.sh fwts-16.03.00/fwts-test/tcpa-0001/test-0001.sh --- fwts-16.02.00/fwts-test/tcpa-0001/test-0001.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/tcpa-0001/test-0001.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/tcpa.log.$$ +$FWTS --show-tests | grep TCPA > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/tcpa-0001/acpidump-0001.log tcpa - | cut -c7- | grep "^tcpa" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/tcpa-0001/tcpa-0001.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/tcpa-0001/test-0002.sh fwts-16.03.00/fwts-test/tcpa-0001/test-0002.sh --- fwts-16.02.00/fwts-test/tcpa-0001/test-0002.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/tcpa-0001/test-0002.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/tcpa.log.$$ +$FWTS --show-tests | grep TCPA > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/tcpa-0001/acpidump-0002.log tcpa - | cut -c7- | grep "^tcpa" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/tcpa-0001/tcpa-0002.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/tpm2-0001/test-0001.sh fwts-16.03.00/fwts-test/tpm2-0001/test-0001.sh --- fwts-16.02.00/fwts-test/tpm2-0001/test-0001.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/tpm2-0001/test-0001.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/tpm2.log.$$ +$FWTS --show-tests | grep TPM2 > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/tpm2-0001/acpidump-0001.log tpm2 - | cut -c7- | grep "^tpm2" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/tpm2-0001/tpm2-0001.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/tpm2-0001/test-0002.sh fwts-16.03.00/fwts-test/tpm2-0001/test-0002.sh --- fwts-16.02.00/fwts-test/tpm2-0001/test-0002.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/tpm2-0001/test-0002.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/tpm2.log.$$ +$FWTS --show-tests | grep TPM2 > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/tpm2-0001/acpidump-0002.log tpm2 - | cut -c7- | grep "^tpm2" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/tpm2-0001/tpm2-0002.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/uefi-0001/test-0001.sh fwts-16.03.00/fwts-test/uefi-0001/test-0001.sh --- fwts-16.02.00/fwts-test/uefi-0001/test-0001.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/uefi-0001/test-0001.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/uefi.log.$$ +$FWTS --show-tests | grep "UEFI Data" > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/uefi-0001/acpidump-0001.log uefi - | cut -c7- | grep "^uefi" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/uefi-0001/uefi-0001.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/uefi-0001/test-0002.sh fwts-16.03.00/fwts-test/uefi-0001/test-0002.sh --- fwts-16.02.00/fwts-test/uefi-0001/test-0002.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/uefi-0001/test-0002.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/uefi.log.$$ +$FWTS --show-tests | grep "UEFI Data" > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/uefi-0001/acpidump-0002.log uefi - | cut -c7- | grep "^uefi" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/uefi-0001/uefi-0002.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/waet-0001/test-0001.sh fwts-16.03.00/fwts-test/waet-0001/test-0001.sh --- fwts-16.02.00/fwts-test/waet-0001/test-0001.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/waet-0001/test-0001.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/waet.log.$$ +$FWTS --show-tests | grep WAET > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/waet-0001/acpidump-0001.log waet - | cut -c7- | grep "^waet" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/waet-0001/waet-0001.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/waet-0001/test-0002.sh fwts-16.03.00/fwts-test/waet-0001/test-0002.sh --- fwts-16.02.00/fwts-test/waet-0001/test-0002.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/waet-0001/test-0002.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/waet.log.$$ +$FWTS --show-tests | grep WAET > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/waet-0001/acpidump-0002.log waet - | cut -c7- | grep "^waet" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/waet-0001/waet-0002.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/waet-0001/test-0003.sh fwts-16.03.00/fwts-test/waet-0001/test-0003.sh --- fwts-16.02.00/fwts-test/waet-0001/test-0003.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/waet-0001/test-0003.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/waet.log.$$ +$FWTS --show-tests | grep WAET > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/waet-0001/acpidump-0003.log waet - | cut -c7- | grep "^waet" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/waet-0001/waet-0003.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/wdat-0001/test-0001.sh fwts-16.03.00/fwts-test/wdat-0001/test-0001.sh --- fwts-16.02.00/fwts-test/wdat-0001/test-0001.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/wdat-0001/test-0001.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/wdat.log.$$ +$FWTS --show-tests | grep WDAT > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/wdat-0001/acpidump-0001.log wdat - | cut -c7- | grep "^wdat" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/wdat-0001/wdat-0001.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/wdat-0001/test-0002.sh fwts-16.03.00/fwts-test/wdat-0001/test-0002.sh --- fwts-16.02.00/fwts-test/wdat-0001/test-0002.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/wdat-0001/test-0002.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0002.sh TMPLOG=$TMP/wdat.log.$$ +$FWTS --show-tests | grep WDAT > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/wdat-0001/acpidump-0002.log wdat - | cut -c7- | grep "^wdat" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/wdat-0001/wdat-0002.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/xenv-0001/test-0001.sh fwts-16.03.00/fwts-test/xenv-0001/test-0001.sh --- fwts-16.02.00/fwts-test/xenv-0001/test-0001.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/xenv-0001/test-0001.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,13 @@ NAME=test-0001.sh TMPLOG=$TMP/xenv.log.$$ +$FWTS --show-tests | grep XENV > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/xenv-0001/acpidump-0001.log xenv - | cut -c7- | grep "^xenv" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/xenv-0001/xenv-0001.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/xenv-0001/test-0002.sh fwts-16.03.00/fwts-test/xenv-0001/test-0002.sh --- fwts-16.02.00/fwts-test/xenv-0001/test-0002.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/xenv-0001/test-0002.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/xenv.log.$$ +$FWTS --show-tests | grep XENV > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/xenv-0001/acpidump-0002.log xenv - | cut -c7- | grep "^xenv" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/xenv-0001/xenv-0002.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/fwts-test/xsdt-0001/test-0001.sh fwts-16.03.00/fwts-test/xsdt-0001/test-0001.sh --- fwts-16.02.00/fwts-test/xsdt-0001/test-0001.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/fwts-test/xsdt-0001/test-0001.sh 2016-03-14 09:10:20.000000000 +0000 @@ -4,6 +4,12 @@ NAME=test-0001.sh TMPLOG=$TMP/xsdt.log.$$ +$FWTS --show-tests | grep XSDT > /dev/null +if [ $? -eq 1 ]; then + echo SKIP: $TEST, $NAME + exit 77 +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/xsdt-0001/acpidump-0001.log xsdt - | cut -c7- | grep "^xsdt" > $TMPLOG diff $TMPLOG $FWTSTESTDIR/xsdt-0001/xsdt.log >> $FAILURE_LOG ret=$? diff -Nru fwts-16.02.00/smatchify.sh fwts-16.03.00/smatchify.sh --- fwts-16.02.00/smatchify.sh 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/smatchify.sh 2016-03-14 09:10:20.000000000 +0000 @@ -98,7 +98,7 @@ ./configure > /dev/null make clean - make CHECK="${HERE}/${SMATCH_DIR}/smatch --full-path" \ + make CHECK="${HERE}/${SMATCH_DIR}/smatch --full-path --two-passes" \ CC="${HERE}/${SMATCH_DIR}/cgcc $INCLUDES" | tee smatch.log } diff -Nru fwts-16.02.00/src/acpi/acpidump/acpidump.c fwts-16.03.00/src/acpi/acpidump/acpidump.c --- fwts-16.02.00/src/acpi/acpidump/acpidump.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/acpidump/acpidump.c 2016-03-14 09:10:20.000000000 +0000 @@ -13,6 +13,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ +#include "fwts.h" + +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -23,8 +27,6 @@ #include #include -#include "fwts.h" - static void acpi_dump_raw_table( fwts_framework *fw, const fwts_acpi_table_info *table) @@ -212,3 +214,5 @@ }; FWTS_REGISTER("acpidump", &acpidump_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UTILS) + +#endif diff -Nru fwts-16.02.00/src/acpi/acpiinfo/acpiinfo.c fwts-16.03.00/src/acpi/acpiinfo/acpiinfo.c --- fwts-16.02.00/src/acpi/acpiinfo/acpiinfo.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/acpiinfo/acpiinfo.c 2016-03-14 09:10:20.000000000 +0000 @@ -18,6 +18,8 @@ */ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -150,3 +152,5 @@ }; FWTS_REGISTER("acpiinfo", &acpiinfo_ops, FWTS_TEST_EARLY, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) + +#endif diff -Nru fwts-16.02.00/src/acpi/acpitables/acpitables.c fwts-16.03.00/src/acpi/acpitables/acpitables.c --- fwts-16.02.00/src/acpi/acpitables/acpitables.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/acpitables/acpitables.c 2016-03-14 09:10:20.000000000 +0000 @@ -13,6 +13,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ +#include "fwts.h" + +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -23,8 +27,6 @@ #include #include -#include "fwts.h" - static bool acpi_table_check_field(const char *field, const size_t len) { size_t i; @@ -126,3 +128,5 @@ }; FWTS_REGISTER("acpitables", &acpi_table_check_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) + +#endif diff -Nru fwts-16.02.00/src/acpi/asf/asf.c fwts-16.03.00/src/acpi/asf/asf.c --- fwts-16.02.00/src/acpi/asf/asf.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/asf/asf.c 2016-03-14 09:10:20.000000000 +0000 @@ -20,6 +20,8 @@ */ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -555,3 +557,5 @@ }; FWTS_REGISTER("asf", &asf_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) + +#endif diff -Nru fwts-16.02.00/src/acpi/aspt/aspt.c fwts-16.03.00/src/acpi/aspt/aspt.c --- fwts-16.02.00/src/acpi/aspt/aspt.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/aspt/aspt.c 2016-03-14 09:10:20.000000000 +0000 @@ -20,6 +20,8 @@ */ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -111,3 +113,5 @@ }; FWTS_REGISTER("aspt", &aspt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) + +#endif diff -Nru fwts-16.02.00/src/acpi/bert/bert.c fwts-16.03.00/src/acpi/bert/bert.c --- fwts-16.02.00/src/acpi/bert/bert.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/bert/bert.c 2016-03-14 09:10:20.000000000 +0000 @@ -20,6 +20,8 @@ */ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -185,3 +187,5 @@ }; FWTS_REGISTER("bert", &bert_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) + +#endif diff -Nru fwts-16.02.00/src/acpi/bgrt/bgrt.c fwts-16.03.00/src/acpi/bgrt/bgrt.c --- fwts-16.02.00/src/acpi/bgrt/bgrt.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/bgrt/bgrt.c 2016-03-14 09:10:20.000000000 +0000 @@ -20,6 +20,8 @@ */ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -101,3 +103,5 @@ }; FWTS_REGISTER("bgrt", &bgrt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) + +#endif diff -Nru fwts-16.02.00/src/acpi/boot/boot.c fwts-16.03.00/src/acpi/boot/boot.c --- fwts-16.02.00/src/acpi/boot/boot.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/boot/boot.c 2016-03-14 09:10:20.000000000 +0000 @@ -20,6 +20,8 @@ */ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -109,3 +111,5 @@ }; FWTS_REGISTER("boot", &boot_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) + +#endif diff -Nru fwts-16.02.00/src/acpi/brightness/brightness-helper.c fwts-16.03.00/src/acpi/brightness/brightness-helper.c --- fwts-16.02.00/src/acpi/brightness/brightness-helper.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/brightness/brightness-helper.c 2016-03-14 09:10:20.000000000 +0000 @@ -17,6 +17,9 @@ * */ #include "fwts.h" + +#if defined(FWTS_HAS_ACPI) + #include "brightness-helper.h" #include @@ -142,3 +145,5 @@ return FWTS_OK; } + +#endif diff -Nru fwts-16.02.00/src/acpi/checksum/checksum.c fwts-16.03.00/src/acpi/checksum/checksum.c --- fwts-16.02.00/src/acpi/checksum/checksum.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/checksum/checksum.c 2016-03-14 09:10:20.000000000 +0000 @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ +#include "fwts.h" + +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -26,8 +30,6 @@ #include #include -#include "fwts.h" - static void checksum_rsdp(fwts_framework *fw, fwts_acpi_table_info *table) { uint8_t checksum; @@ -156,3 +158,5 @@ }; FWTS_REGISTER("checksum", &checksum_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) + +#endif diff -Nru fwts-16.02.00/src/acpi/cpep/cpep.c fwts-16.03.00/src/acpi/cpep/cpep.c --- fwts-16.02.00/src/acpi/cpep/cpep.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/cpep/cpep.c 2016-03-14 09:10:20.000000000 +0000 @@ -20,6 +20,8 @@ */ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -126,3 +128,5 @@ }; FWTS_REGISTER("cpep", &cpep_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) + +#endif diff -Nru fwts-16.02.00/src/acpi/crsdump/crsdump.c fwts-16.03.00/src/acpi/crsdump/crsdump.c --- fwts-16.02.00/src/acpi/crsdump/crsdump.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/crsdump/crsdump.c 2016-03-14 09:10:20.000000000 +0000 @@ -18,6 +18,8 @@ */ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -917,3 +919,5 @@ }; FWTS_REGISTER("crsdump", &crsdump_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UTILS) + +#endif diff -Nru fwts-16.02.00/src/acpi/crsdump/prsdump.c fwts-16.03.00/src/acpi/crsdump/prsdump.c --- fwts-16.02.00/src/acpi/crsdump/prsdump.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/crsdump/prsdump.c 2016-03-14 09:10:20.000000000 +0000 @@ -17,6 +17,9 @@ * */ #include "fwts.h" + +#if defined(FWTS_HAS_ACPI) + #include "fwts_acpi_object_eval.h" #include "crsdump.h" @@ -61,3 +64,5 @@ }; FWTS_REGISTER("prsdump", &prsdump_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UTILS) + +#endif diff -Nru fwts-16.02.00/src/acpi/csrt/csrt.c fwts-16.03.00/src/acpi/csrt/csrt.c --- fwts-16.02.00/src/acpi/csrt/csrt.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/csrt/csrt.c 2016-03-14 09:10:20.000000000 +0000 @@ -20,6 +20,8 @@ */ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -52,7 +54,7 @@ bool passed = true; int rg_count = 0; - /* Note: CSRT header is actually just and ACPI header */ + /* Note: CSRT header is actually just an ACPI header */ if (table->length < sizeof(fwts_acpi_table_csrt)) { passed = false; fwts_failed(fw, LOG_LEVEL_HIGH, @@ -122,7 +124,8 @@ /* Do we have enough space for a resource descriptor? */ if (rg_length > sizeof(fwts_acpi_table_csrt_resource_descriptor)) { - size_t rd_offset = sizeof(fwts_acpi_table_csrt_resource_group); + size_t rd_offset = sizeof(fwts_acpi_table_csrt_resource_group) + + rg->shared_info_length; int rd_count = 0; fwts_acpi_table_csrt_resource_descriptor *rd = (fwts_acpi_table_csrt_resource_descriptor *) @@ -243,3 +246,5 @@ }; FWTS_REGISTER("csrt", &csrt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) + +#endif diff -Nru fwts-16.02.00/src/acpi/dbg2/dbg2.c fwts-16.03.00/src/acpi/dbg2/dbg2.c --- fwts-16.02.00/src/acpi/dbg2/dbg2.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/dbg2/dbg2.c 2016-03-14 09:10:20.000000000 +0000 @@ -20,6 +20,8 @@ */ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -407,3 +409,5 @@ }; FWTS_REGISTER("dbg2", &dbg2_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) + +#endif diff -Nru fwts-16.02.00/src/acpi/dbgp/dbgp.c fwts-16.03.00/src/acpi/dbgp/dbgp.c --- fwts-16.02.00/src/acpi/dbgp/dbgp.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/dbgp/dbgp.c 2016-03-14 09:10:20.000000000 +0000 @@ -20,6 +20,8 @@ */ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -137,3 +139,5 @@ }; FWTS_REGISTER("dbgp", &dbgp_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) + +#endif diff -Nru fwts-16.02.00/src/acpi/ecdt/ecdt.c fwts-16.03.00/src/acpi/ecdt/ecdt.c --- fwts-16.02.00/src/acpi/ecdt/ecdt.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/ecdt/ecdt.c 2016-03-14 09:10:20.000000000 +0000 @@ -20,6 +20,8 @@ */ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -218,3 +220,5 @@ }; FWTS_REGISTER("ecdt", &ecdt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) + +#endif diff -Nru fwts-16.02.00/src/acpi/erst/erst.c fwts-16.03.00/src/acpi/erst/erst.c --- fwts-16.02.00/src/acpi/erst/erst.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/erst/erst.c 2016-03-14 09:10:20.000000000 +0000 @@ -20,6 +20,8 @@ */ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -190,3 +192,5 @@ }; FWTS_REGISTER("erst", &erst_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) + +#endif diff -Nru fwts-16.02.00/src/acpi/facs/facs.c fwts-16.03.00/src/acpi/facs/facs.c --- fwts-16.02.00/src/acpi/facs/facs.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/facs/facs.c 2016-03-14 09:10:20.000000000 +0000 @@ -20,6 +20,8 @@ */ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -174,3 +176,5 @@ }; FWTS_REGISTER("facs", &facs_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) + +#endif diff -Nru fwts-16.02.00/src/acpi/fadt/fadt.c fwts-16.03.00/src/acpi/fadt/fadt.c --- fwts-16.02.00/src/acpi/fadt/fadt.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/fadt/fadt.c 2016-03-14 09:10:20.000000000 +0000 @@ -19,6 +19,9 @@ * */ #include "fwts.h" + +#if defined(FWTS_HAS_ACPI) + #include "fwts_acpi_object_eval.h" #include @@ -1839,4 +1842,4 @@ FWTS_REGISTER("fadt", &fadt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_TEST_ACPI | FWTS_FLAG_TEST_COMPLIANCE_ACPI) - +#endif diff -Nru fwts-16.02.00/src/acpi/fan/fan.c fwts-16.03.00/src/acpi/fan/fan.c --- fwts-16.02.00/src/acpi/fan/fan.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/fan/fan.c 2016-03-14 09:10:20.000000000 +0000 @@ -219,13 +219,13 @@ "Fan %s current state decreased from %d to %d " "while CPUs were busy, expected an increase.", info1->name, info1->cur_state, info2->cur_state); - changed = true; + changed = true; } if (info2->cur_state > info1->cur_state) { fwts_passed(fw, "Fan %s current state increased from %d to %d " "while CPUs were busy.", info1->name, info1->cur_state, info2->cur_state); - changed = true; + changed = true; } if (info2->cur_state == info1->cur_state) fwts_log_info(fw, "Fan %s current state did not change from value %d " diff -Nru fwts-16.02.00/src/acpi/fpdt/fpdt.c fwts-16.03.00/src/acpi/fpdt/fpdt.c --- fwts-16.02.00/src/acpi/fpdt/fpdt.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/fpdt/fpdt.c 2016-03-14 09:10:20.000000000 +0000 @@ -18,6 +18,8 @@ */ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -228,3 +230,5 @@ }; FWTS_REGISTER("fpdt", &fpdt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) + +#endif diff -Nru fwts-16.02.00/src/acpi/gpedump/gpedump.c fwts-16.03.00/src/acpi/gpedump/gpedump.c --- fwts-16.02.00/src/acpi/gpedump/gpedump.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/gpedump/gpedump.c 2016-03-14 09:10:20.000000000 +0000 @@ -17,6 +17,9 @@ * */ #include "fwts.h" + +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -179,3 +182,5 @@ }; FWTS_REGISTER("gpedump", &gpedump_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UTILS) + +#endif diff -Nru fwts-16.02.00/src/acpi/gtdt/gtdt.c fwts-16.03.00/src/acpi/gtdt/gtdt.c --- fwts-16.02.00/src/acpi/gtdt/gtdt.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/gtdt/gtdt.c 2016-03-14 09:10:20.000000000 +0000 @@ -20,6 +20,8 @@ */ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -246,3 +248,5 @@ }; FWTS_REGISTER("gtdt", >dt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) + +#endif diff -Nru fwts-16.02.00/src/acpi/hest/hest.c fwts-16.03.00/src/acpi/hest/hest.c --- fwts-16.02.00/src/acpi/hest/hest.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/hest/hest.c 2016-03-14 09:10:20.000000000 +0000 @@ -20,6 +20,8 @@ */ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -783,3 +785,5 @@ }; FWTS_REGISTER("hest", &hest_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) + +#endif diff -Nru fwts-16.02.00/src/acpi/hpet/hpet.c fwts-16.03.00/src/acpi/hpet/hpet.c --- fwts-16.02.00/src/acpi/hpet/hpet.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/hpet/hpet.c 2016-03-14 09:10:20.000000000 +0000 @@ -19,13 +19,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ -#include -#include - #include "fwts.h" #ifdef FWTS_ARCH_INTEL +#include +#include + static fwts_list *klog; diff -Nru fwts-16.02.00/src/acpi/iort/iort.c fwts-16.03.00/src/acpi/iort/iort.c --- fwts-16.02.00/src/acpi/iort/iort.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/iort/iort.c 2016-03-14 09:10:20.000000000 +0000 @@ -20,6 +20,8 @@ */ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -705,3 +707,5 @@ }; FWTS_REGISTER("iort", &iort_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) + +#endif diff -Nru fwts-16.02.00/src/acpi/lpit/lpit.c fwts-16.03.00/src/acpi/lpit/lpit.c --- fwts-16.02.00/src/acpi/lpit/lpit.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/lpit/lpit.c 2016-03-14 09:10:20.000000000 +0000 @@ -20,6 +20,8 @@ */ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -227,3 +229,5 @@ }; FWTS_REGISTER("lpit", &lpit_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) + +#endif diff -Nru fwts-16.02.00/src/acpi/madt/madt.c fwts-16.03.00/src/acpi/madt/madt.c --- fwts-16.02.00/src/acpi/madt/madt.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/madt/madt.c 2016-03-14 09:10:20.000000000 +0000 @@ -15,6 +15,8 @@ */ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -1380,3 +1382,5 @@ }; FWTS_REGISTER("madt", &madt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI | FWTS_FLAG_TEST_COMPLIANCE_ACPI) + +#endif diff -Nru fwts-16.02.00/src/acpi/mchi/mchi.c fwts-16.03.00/src/acpi/mchi/mchi.c --- fwts-16.02.00/src/acpi/mchi/mchi.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/mchi/mchi.c 2016-03-14 09:10:20.000000000 +0000 @@ -18,6 +18,8 @@ */ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -243,3 +245,5 @@ }; FWTS_REGISTER("mchi", &mchi_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) + +#endif diff -Nru fwts-16.02.00/src/acpi/method/method.c fwts-16.03.00/src/acpi/method/method.c --- fwts-16.02.00/src/acpi/method/method.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/method/method.c 2016-03-14 09:10:20.000000000 +0000 @@ -18,6 +18,8 @@ */ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -27,7 +29,6 @@ #include #include "fwts_acpi_object_eval.h" - /* * ACPI methods + objects used in Linux ACPI driver: * @@ -90,7 +91,7 @@ * _DSW 7.2.1 Y * _DTI 11.4.5 Y * _Exx 5.6.4.1 n/a - * _EC 12.12 Y + * _EC_ 12.12 Y * _EDL 6.3.1 Y * _EJD 6.3.2 Y * _EJx 6.3.3 Y @@ -2138,7 +2139,7 @@ "%s GPIO Connection Descriptor has an invalid " "Connection Type 0x%" PRIx8 ".", name, data[2]); - *passed = false; + *passed = false; fwts_advice(fw, "The GPIO pin connection type is " "not recognised. It should be either " @@ -2153,7 +2154,7 @@ "%s GPIO Connection Descriptor has an invalid " "Pin Configuration Type 0x%" PRIx8 ".", name, data[9]); - *passed = false; + *passed = false; fwts_advice(fw, "The GPIO pin configuration type " "is not recognised. It should be one of:" @@ -2727,10 +2728,10 @@ /* * Section 7.1 Declaring a Power Resource Object */ -static int method_test_ON(fwts_framework *fw) +static int method_test_ON_(fwts_framework *fw) { return method_evaluate_method(fw, METHOD_OPTIONAL, - "_ON", NULL, 0, method_test_NULL_return, NULL); + "_ON_", NULL, 0, method_test_NULL_return, NULL); } static int method_test_OFF(fwts_framework *fw) @@ -4139,7 +4140,7 @@ for (i = 0; i < obj->Package.Count; i++) { if (i < 3) { if (obj->Package.Elements[i].Type != ACPI_TYPE_INTEGER) { - fwts_failed(fw, LOG_LEVEL_HIGH, + fwts_failed(fw, LOG_LEVEL_HIGH, "Method_LPIBadElementType", "%s element %" PRIu32 " is not an integer.", name, i); failed = true; @@ -4168,7 +4169,7 @@ } else { ACPI_OBJECT *pkg; if (obj->Package.Elements[i].Type != ACPI_TYPE_PACKAGE) { - fwts_failed(fw, LOG_LEVEL_HIGH, + fwts_failed(fw, LOG_LEVEL_HIGH, "Method_LPIBadElementType", "%s element %" PRIu32 " is not a package.", name, i); failed = true; @@ -4268,7 +4269,7 @@ pkg = &obj->Package.Elements[i]; if (pkg->Type != ACPI_TYPE_PACKAGE) { - fwts_failed(fw, LOG_LEVEL_HIGH, + fwts_failed(fw, LOG_LEVEL_HIGH, "Method_RDIBadElementType", "%s element %" PRIu32 " is not a package.", name, i); failed = true; @@ -6323,10 +6324,10 @@ "_GPE", NULL, 0, method_test_GPE_return, "_GPE"); } -static int method_test_EC(fwts_framework *fw) +static int method_test_EC_(fwts_framework *fw) { return method_evaluate_method(fw, METHOD_OPTIONAL, - "_EC", NULL, 0, method_test_integer_return, NULL); + "_EC_", NULL, 0, method_test_integer_return, NULL); } /* @@ -6399,38 +6400,6 @@ return FWTS_OK; } -static void method_test_Sx_return( - fwts_framework *fw, - char *name, - ACPI_BUFFER *buf, - ACPI_OBJECT *obj, - void *private) -{ - char *method = (char *)private; - - if (method_check_type(fw, name, buf, ACPI_TYPE_PACKAGE) != FWTS_OK) - return; - - if (method_package_count_equal(fw, name, method, obj, 3) != FWTS_OK) - return; - - fwts_acpi_object_dump(fw, obj); -} - -#define method_test_Sx(name) \ -static int method_test ## name(fwts_framework *fw) \ -{ \ - return method_evaluate_method(fw, METHOD_OPTIONAL, \ - # name, NULL, 0, method_test_Sx_return, # name);\ -} - -method_test_Sx(_S0) -method_test_Sx(_S1) -method_test_Sx(_S2) -method_test_Sx(_S3) -method_test_Sx(_S4) -method_test_Sx(_S5) - static void method_test_WAK_return( fwts_framework *fw, char *name, @@ -6953,7 +6922,7 @@ /* Section 7.1 Declaring a Power Resource Object */ { method_test_OFF, "Test _OFF (Set resource off)." }, - { method_test_ON, "Test _ON (Set resource on)." }, + { method_test_ON_, "Test _ON_ (Set resource on)." }, /* Section 7.2 Device Power Management Objects */ @@ -7146,18 +7115,12 @@ /* Section 12 Embedded Controller Interface */ { method_test_GPE, "Test _GPE (General Purpose Events)." }, - { method_test_EC, "Test _EC (EC Offset Query)." }, + { method_test_EC_, "Test _EC_ (EC Offset Query)." }, /* Section 16 Waking and Sleeping */ { method_test_PTS, "Test _PTS (Prepare to Sleep)." }, { method_test_TTS, "Test _TTS (Transition to State)." }, - { method_test_S0, "Test _S0 (System S0 State)." }, - { method_test_S1, "Test _S1 (System S1 State)." }, - { method_test_S2, "Test _S2 (System S2 State)." }, - { method_test_S3, "Test _S3 (System S3 State)." }, - { method_test_S4, "Test _S4 (System S4 State)." }, - { method_test_S5, "Test _S5 (System S5 State)." }, { method_test_WAK, "Test _WAK (System Wake)." }, /* Appendix B, ACPI Extensions for Display Adapters */ @@ -7197,3 +7160,5 @@ }; FWTS_REGISTER("method", &method_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) + +#endif diff -Nru fwts-16.02.00/src/acpi/msdm/msdm.c fwts-16.03.00/src/acpi/msdm/msdm.c --- fwts-16.02.00/src/acpi/msdm/msdm.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/msdm/msdm.c 2016-03-14 09:10:20.000000000 +0000 @@ -18,6 +18,8 @@ */ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -171,3 +173,5 @@ }; FWTS_REGISTER("msdm", &msdm_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) + +#endif diff -Nru fwts-16.02.00/src/acpi/plddump/plddump.c fwts-16.03.00/src/acpi/plddump/plddump.c --- fwts-16.02.00/src/acpi/plddump/plddump.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/plddump/plddump.c 2016-03-14 09:10:20.000000000 +0000 @@ -17,6 +17,9 @@ * */ #include "fwts.h" + +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -265,3 +268,5 @@ }; FWTS_REGISTER("plddump", &plddump_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UTILS) + +#endif diff -Nru fwts-16.02.00/src/acpi/rsdp/rsdp.c fwts-16.03.00/src/acpi/rsdp/rsdp.c --- fwts-16.02.00/src/acpi/rsdp/rsdp.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/rsdp/rsdp.c 2016-03-14 09:10:20.000000000 +0000 @@ -16,6 +16,8 @@ */ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -224,3 +226,5 @@ FWTS_REGISTER("rsdp", &rsdp_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI | FWTS_FLAG_TEST_COMPLIANCE_ACPI) + +#endif diff -Nru fwts-16.02.00/src/acpi/rsdt/rsdt.c fwts-16.03.00/src/acpi/rsdt/rsdt.c --- fwts-16.02.00/src/acpi/rsdt/rsdt.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/rsdt/rsdt.c 2016-03-14 09:10:20.000000000 +0000 @@ -20,6 +20,8 @@ */ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -83,3 +85,5 @@ }; FWTS_REGISTER("rsdt", &rsdt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) + +#endif diff -Nru fwts-16.02.00/src/acpi/sbst/sbst.c fwts-16.03.00/src/acpi/sbst/sbst.c --- fwts-16.02.00/src/acpi/sbst/sbst.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/sbst/sbst.c 2016-03-14 09:10:20.000000000 +0000 @@ -20,6 +20,8 @@ */ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -93,3 +95,5 @@ }; FWTS_REGISTER("sbst", &sbst_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) + +#endif diff -Nru fwts-16.02.00/src/acpi/slic/slic.c fwts-16.03.00/src/acpi/slic/slic.c --- fwts-16.02.00/src/acpi/slic/slic.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/slic/slic.c 2016-03-14 09:10:20.000000000 +0000 @@ -20,6 +20,8 @@ */ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -180,3 +182,5 @@ }; FWTS_REGISTER("slic", &slic_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) + +#endif diff -Nru fwts-16.02.00/src/acpi/slit/slit.c fwts-16.03.00/src/acpi/slit/slit.c --- fwts-16.02.00/src/acpi/slit/slit.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/slit/slit.c 2016-03-14 09:10:20.000000000 +0000 @@ -20,6 +20,8 @@ */ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -188,3 +190,5 @@ }; FWTS_REGISTER("slit", &slit_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) + +#endif diff -Nru fwts-16.02.00/src/acpi/spcr/spcr.c fwts-16.03.00/src/acpi/spcr/spcr.c --- fwts-16.02.00/src/acpi/spcr/spcr.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/spcr/spcr.c 2016-03-14 09:10:20.000000000 +0000 @@ -20,6 +20,8 @@ */ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -289,3 +291,5 @@ }; FWTS_REGISTER("spcr", &spcr_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) + +#endif diff -Nru fwts-16.02.00/src/acpi/spmi/spmi.c fwts-16.03.00/src/acpi/spmi/spmi.c --- fwts-16.02.00/src/acpi/spmi/spmi.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/spmi/spmi.c 2016-03-14 09:10:20.000000000 +0000 @@ -20,6 +20,8 @@ */ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -241,3 +243,5 @@ }; FWTS_REGISTER("spmi", &spmi_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) + +#endif diff -Nru fwts-16.02.00/src/acpi/srat/srat.c fwts-16.03.00/src/acpi/srat/srat.c --- fwts-16.02.00/src/acpi/srat/srat.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/srat/srat.c 2016-03-14 09:10:20.000000000 +0000 @@ -20,6 +20,8 @@ */ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -353,3 +355,5 @@ }; FWTS_REGISTER("srat", &srat_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) + +#endif diff -Nru fwts-16.02.00/src/acpi/stao/stao.c fwts-16.03.00/src/acpi/stao/stao.c --- fwts-16.02.00/src/acpi/stao/stao.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/stao/stao.c 2016-03-14 09:10:20.000000000 +0000 @@ -20,6 +20,8 @@ */ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -217,3 +219,5 @@ }; FWTS_REGISTER("stao", &stao_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) + +#endif diff -Nru fwts-16.02.00/src/acpi/syntaxcheck/syntaxcheck.c fwts-16.03.00/src/acpi/syntaxcheck/syntaxcheck.c --- fwts-16.02.00/src/acpi/syntaxcheck/syntaxcheck.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/syntaxcheck/syntaxcheck.c 2016-03-14 09:10:20.000000000 +0000 @@ -18,6 +18,8 @@ */ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -644,3 +646,5 @@ }; FWTS_REGISTER("syntaxcheck", &syntaxcheck_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH) + +#endif diff -Nru fwts-16.02.00/src/acpi/tcpa/tcpa.c fwts-16.03.00/src/acpi/tcpa/tcpa.c --- fwts-16.02.00/src/acpi/tcpa/tcpa.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/tcpa/tcpa.c 2016-03-14 09:10:20.000000000 +0000 @@ -13,6 +13,9 @@ * */ #include "fwts.h" + +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -224,3 +227,5 @@ }; FWTS_REGISTER("tcpa", &tcpa_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) + +#endif diff -Nru fwts-16.02.00/src/acpi/tpm2/tpm2.c fwts-16.03.00/src/acpi/tpm2/tpm2.c --- fwts-16.02.00/src/acpi/tpm2/tpm2.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/tpm2/tpm2.c 2016-03-14 09:10:20.000000000 +0000 @@ -13,6 +13,9 @@ * */ #include "fwts.h" + +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -114,3 +117,5 @@ }; FWTS_REGISTER("tpm2", &tpm2_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) + +#endif diff -Nru fwts-16.02.00/src/acpi/uefi/uefi.c fwts-16.03.00/src/acpi/uefi/uefi.c --- fwts-16.02.00/src/acpi/uefi/uefi.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/uefi/uefi.c 2016-03-14 09:10:20.000000000 +0000 @@ -20,6 +20,8 @@ */ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -133,3 +135,5 @@ }; FWTS_REGISTER("uefi", &uefi_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) + +#endif diff -Nru fwts-16.02.00/src/acpi/waet/waet.c fwts-16.03.00/src/acpi/waet/waet.c --- fwts-16.02.00/src/acpi/waet/waet.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/waet/waet.c 2016-03-14 09:10:20.000000000 +0000 @@ -20,6 +20,8 @@ */ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -98,3 +100,5 @@ }; FWTS_REGISTER("waet", &waet_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) + +#endif diff -Nru fwts-16.02.00/src/acpi/wdat/wdat.c fwts-16.03.00/src/acpi/wdat/wdat.c --- fwts-16.02.00/src/acpi/wdat/wdat.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/wdat/wdat.c 2016-03-14 09:10:20.000000000 +0000 @@ -20,6 +20,8 @@ */ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -225,3 +227,5 @@ }; FWTS_REGISTER("wdat", &wdat_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) + +#endif diff -Nru fwts-16.02.00/src/acpi/xenv/xenv.c fwts-16.03.00/src/acpi/xenv/xenv.c --- fwts-16.02.00/src/acpi/xenv/xenv.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/xenv/xenv.c 2016-03-14 09:10:20.000000000 +0000 @@ -16,11 +16,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ +#include "fwts.h" + +#if defined(FWTS_HAS_ACPI) + #include #include -#include "fwts.h" - static fwts_acpi_table_info *table; static int xenv_init(fwts_framework *fw) @@ -97,3 +99,5 @@ FWTS_REGISTER("xenv", &xenv_check_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) + +#endif diff -Nru fwts-16.02.00/src/acpi/xsdt/xsdt.c fwts-16.03.00/src/acpi/xsdt/xsdt.c --- fwts-16.02.00/src/acpi/xsdt/xsdt.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpi/xsdt/xsdt.c 2016-03-14 09:10:20.000000000 +0000 @@ -20,6 +20,8 @@ */ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -83,3 +85,5 @@ }; FWTS_REGISTER("xsdt", &xsdt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) + +#endif diff -Nru fwts-16.02.00/src/acpica/fwts_acpica.c fwts-16.03.00/src/acpica/fwts_acpica.c --- fwts-16.02.00/src/acpica/fwts_acpica.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/acpica/fwts_acpica.c 2016-03-14 09:10:20.000000000 +0000 @@ -35,6 +35,8 @@ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + /* ACPICA specific headers */ #include "acpi.h" #include "accommon.h" @@ -1195,3 +1197,5 @@ return list; } + +#endif diff -Nru fwts-16.02.00/src/bios/multiproc/mpcheck.c fwts-16.03.00/src/bios/multiproc/mpcheck.c --- fwts-16.02.00/src/bios/multiproc/mpcheck.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/bios/multiproc/mpcheck.c 2016-03-14 09:10:20.000000000 +0000 @@ -92,7 +92,7 @@ "0x%2.2" PRIx8 ".", n, phys_addr1, m, phys_addr2, cpu_entry1->local_apic_id); - failed = true; + failed = true; break; } } diff -Nru fwts-16.02.00/src/bios/multiproc/mpdump.c fwts-16.03.00/src/bios/multiproc/mpdump.c --- fwts-16.02.00/src/bios/multiproc/mpdump.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/bios/multiproc/mpdump.c 2016-03-14 09:10:20.000000000 +0000 @@ -347,9 +347,10 @@ fwts_log_info_verbatum(fw, " ID Type"); fwts_list_foreach(entry, &sorted) { uint8_t *data = fwts_list_data(uint8_t *, entry); - fwts_log_info_verbatum(fw, " %3d %s APIC", - mpdump_get_apic_id(data), - (*data == FWTS_MP_CPU_ENTRY) ? "CPU Local" : "I/O"); + + fwts_log_info_verbatum(fw, " %3d %s APIC", + mpdump_get_apic_id(data), + (*data == FWTS_MP_CPU_ENTRY) ? "CPU Local" : "I/O"); } fwts_log_nl(fw); fwts_list_free_items(&sorted, NULL); diff -Nru fwts-16.02.00/src/lib/include/fwts_acpi.h fwts-16.03.00/src/lib/include/fwts_acpi.h --- fwts-16.02.00/src/lib/include/fwts_acpi.h 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/lib/include/fwts_acpi.h 2016-03-14 09:10:20.000000000 +0000 @@ -20,6 +20,10 @@ #ifndef __FWTS_ACPI_H__ #define __FWTS_ACPI_H__ +#include "fwts.h" + +#if defined(FWTS_HAS_ACPI) + #define FWTS_ACPI_TABLES_PATH "/sys/firmware/acpi/tables" #define FWTS_FACP_UNSPECIFIED (0x00) @@ -1468,3 +1472,5 @@ } __attribute__ ((packed)) fwts_acpi_table_aspt; #endif + +#endif diff -Nru fwts-16.02.00/src/lib/include/fwts_acpi_tables.h fwts-16.03.00/src/lib/include/fwts_acpi_tables.h --- fwts-16.02.00/src/lib/include/fwts_acpi_tables.h 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/lib/include/fwts_acpi_tables.h 2016-03-14 09:10:20.000000000 +0000 @@ -22,6 +22,8 @@ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + #define ACPI_MAX_TABLES (128) typedef enum { @@ -52,3 +54,5 @@ fwts_bool fwts_acpi_is_reduced_hardware(const fwts_acpi_table_fadt *fadt); #endif + +#endif diff -Nru fwts-16.02.00/src/lib/include/fwts.h fwts-16.03.00/src/lib/include/fwts.h --- fwts-16.02.00/src/lib/include/fwts.h 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/lib/include/fwts.h 2016-03-14 09:10:20.000000000 +0000 @@ -24,12 +24,21 @@ #if defined(__x86_64__) || defined(__x86_64) || defined(__i386__) || defined(__i386) #define FWTS_ARCH_INTEL 1 +#define FWTS_HAS_ACPI 1 +#define FWTS_HAS_UEFI 1 #endif #if defined(__aarch64__) #define FWTS_ARCH_AARCH64 1 +#define FWTS_HAS_ACPI 1 +#define FWTS_HAS_UEFI 1 #endif +#if defined(__s390x__) +#define FWTS_ARCH_S390X 1 +#endif + + #define FWTS_UNUSED(var) (void)var #define FWTS_JSON_DATA_PATH DATAROOTDIR "/fwts" diff -Nru fwts-16.02.00/src/lib/include/fwts_iasl.h fwts-16.03.00/src/lib/include/fwts_iasl.h --- fwts-16.02.00/src/lib/include/fwts_iasl.h 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/lib/include/fwts_iasl.h 2016-03-14 09:10:20.000000000 +0000 @@ -23,6 +23,8 @@ #include "fwts.h" #include +#if defined(FWTS_HAS_ACPI) + int fwts_iasl_init(fwts_framework *fw); void fwts_iasl_deinit(void); @@ -43,3 +45,5 @@ const char *fwts_iasl_exception_level(uint8_t level); #endif + +#endif diff -Nru fwts-16.02.00/src/lib/include/fwts_version.h fwts-16.03.00/src/lib/include/fwts_version.h --- fwts-16.02.00/src/lib/include/fwts_version.h 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/lib/include/fwts_version.h 2016-03-14 09:10:20.000000000 +0000 @@ -16,5 +16,5 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ -#define FWTS_VERSION "V16.02.00" -#define FWTS_DATE "2016-02-25 07:49:45" +#define FWTS_VERSION "V16.03.00" +#define FWTS_DATE "2016-03-14 09:10:20" diff -Nru fwts-16.02.00/src/lib/src/fwts_acpi.c fwts-16.03.00/src/lib/src/fwts_acpi.c --- fwts-16.02.00/src/lib/src/fwts_acpi.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/lib/src/fwts_acpi.c 2016-03-14 09:10:20.000000000 +0000 @@ -28,6 +28,8 @@ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + const char *fwts_acpi_fadt_preferred_pm_profile[] = { "Unspecified", "Desktop", @@ -48,3 +50,5 @@ { memcpy(hdr, data, sizeof(fwts_acpi_table_header)); } + +#endif diff -Nru fwts-16.02.00/src/lib/src/fwts_acpi_object_eval.c fwts-16.03.00/src/lib/src/fwts_acpi_object_eval.c --- fwts-16.02.00/src/lib/src/fwts_acpi_object_eval.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/lib/src/fwts_acpi_object_eval.c 2016-03-14 09:10:20.000000000 +0000 @@ -18,6 +18,8 @@ */ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -455,3 +457,4 @@ return AcpiEvaluateObject(NULL, name, arg_list, buf); } +#endif diff -Nru fwts-16.02.00/src/lib/src/fwts_acpi_tables.c fwts-16.03.00/src/lib/src/fwts_acpi_tables.c --- fwts-16.02.00/src/lib/src/fwts_acpi_tables.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/lib/src/fwts_acpi_tables.c 2016-03-14 09:10:20.000000000 +0000 @@ -35,6 +35,8 @@ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + #define BIOS_START (0x000e0000) /* Start of BIOS memory */ #define BIOS_END (0x000fffff) /* End of BIOS memory */ #define BIOS_LENGTH (BIOS_END - BIOS_START) /* Length of BIOS memory */ @@ -1279,3 +1281,5 @@ *info = &tables[index]; return FWTS_OK; } + +#endif diff -Nru fwts-16.02.00/src/lib/src/fwts_cpu.c fwts-16.03.00/src/lib/src/fwts_cpu.c --- fwts-16.02.00/src/lib/src/fwts_cpu.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/lib/src/fwts_cpu.c 2016-03-14 09:10:20.000000000 +0000 @@ -195,22 +195,25 @@ */ fwts_bool fwts_cpu_has_c1e(void) { +#if FWTS_ARCH_X86 uint64_t val; + fwts_bool rc = FWTS_FALSE; fwts_cpuinfo_x86 *cpu; if ((cpu = fwts_cpu_get_info(0)) == NULL) return FWTS_BOOL_ERROR; + /* no C1E on AMD */ if (strstr(cpu->vendor_id, "AuthenticAMD") == NULL) { - fwts_cpu_free_info(cpu); - return FWTS_FALSE; + rc = FWTS_FALSE; + goto free_info; } /* Family 0x0f models < rev F do not have C1E */ if (cpu->x86 == 0x0F && cpu->x86_model >= 0x40) { - fwts_cpu_free_info(cpu); - return FWTS_TRUE; + rc = FWTS_FALSE; + goto free_info; } if (cpu->x86 == 0x10) { @@ -219,23 +222,30 @@ * by erratum #400 */ if (strstr(cpu->flags, "osvw") != NULL) { - if (fwts_cpu_readmsr(0, MSR_AMD64_OSVW_ID_LENGTH, &val) != FWTS_OK) - return FWTS_BOOL_ERROR; + if (fwts_cpu_readmsr(0, MSR_AMD64_OSVW_ID_LENGTH, &val) != FWTS_OK) { + rc = FWTS_BOOL_ERROR; + goto free_info; + } if (val >= 2) { if (fwts_cpu_readmsr(0, MSR_AMD64_OSVW_STATUS, &val) != FWTS_OK) - return FWTS_BOOL_ERROR; + rc = FWTS_BOOL_ERROR; + goto free_info; if (!(val & 2)) { - fwts_cpu_free_info(cpu); - return FWTS_FALSE; + rc = FWTS_FALSE; + goto free_info; } } } - fwts_cpu_free_info(cpu); - return FWTS_TRUE; + rc = FWTS_TRUE; } + +free_info: fwts_cpu_free_info(cpu); + return rc; +#else return FWTS_FALSE; +#endif } /* diff -Nru fwts-16.02.00/src/lib/src/fwts_dump.c fwts-16.03.00/src/lib/src/fwts_dump.c --- fwts-16.02.00/src/lib/src/fwts_dump.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/lib/src/fwts_dump.c 2016-03-14 09:10:20.000000000 +0000 @@ -134,6 +134,7 @@ return dump_exec("lspci.log", command); } +#if defined(FWTS_HAS_ACPI) /* * dump_acpi_table() * hex dump of a ACPI table @@ -185,6 +186,7 @@ return FWTS_OK; } +#endif /* * dump_readme() @@ -290,6 +292,7 @@ else printf("Dumped lspci data to lspci.log\n"); +#if defined(FWTS_HAS_ACPI) switch (dump_acpi_tables(fw)) { case FWTS_OK: printf("Dumped ACPI tables to acpidump.log\n"); @@ -301,6 +304,7 @@ fprintf(stderr, "Failed to dump ACPI tables.\n"); break; } +#endif if (dump_cpuinfo() != FWTS_OK) fprintf(stderr, "Failed to dump cpuinfo.\n"); diff -Nru fwts-16.02.00/src/lib/src/fwts_framework.c fwts-16.03.00/src/lib/src/fwts_framework.c --- fwts-16.02.00/src/lib/src/fwts_framework.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/lib/src/fwts_framework.c 2016-03-14 09:10:20.000000000 +0000 @@ -1250,8 +1250,13 @@ fwts_framework_strdup(&fw->json_data_path, optarg); break; case 29: /* --disassemble-aml */ +#if defined(FWTS_HAS_ACPI) fwts_iasl_disassemble_all_to_file(fw, optarg); return FWTS_COMPLETE; +#else + fprintf(stderr, "option not available on this architecture\n"); + return FWTS_ERROR; +#endif case 30: /* --log-type */ if (fwts_framework_log_type_parse(fw, optarg) != FWTS_OK) return FWTS_ERROR; @@ -1569,7 +1574,9 @@ fwts_log_close(fw->results); tidy_close: +#if defined(FWTS_HAS_ACPI) fwts_acpi_free_tables(); +#endif fwts_summary_deinit(); free(fw->lspci); diff -Nru fwts-16.02.00/src/lib/src/fwts_iasl.c fwts-16.03.00/src/lib/src/fwts_iasl.c --- fwts-16.02.00/src/lib/src/fwts_iasl.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/lib/src/fwts_iasl.c 2016-03-14 09:10:20.000000000 +0000 @@ -28,6 +28,9 @@ #include #include "fwts.h" + +#if defined(FWTS_HAS_ACPI) + #include "fwts_iasl_interface.h" #include "fwts_acpica.h" @@ -317,3 +320,5 @@ { return fwts_iasl_exception_level__(level); } + +#endif diff -Nru fwts-16.02.00/src/Makefile.am fwts-16.03.00/src/Makefile.am --- fwts-16.02.00/src/Makefile.am 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/Makefile.am 2016-03-14 09:10:20.000000000 +0000 @@ -130,7 +130,8 @@ uefi/uefivarinfo/uefivarinfo.c \ uefi/uefibootpath/uefibootpath.c \ uefi/uefirtauthvar/uefirtauthvar.c \ - uefi/esrtdump/esrtdump.c + uefi/esrtdump/esrtdump.c \ + uefi/esrt/esrt.c fwts_LDFLAGS = -lm `pkg-config --libs glib-2.0 gio-2.0` diff -Nru fwts-16.02.00/src/pci/aspm/aspm.c fwts-16.03.00/src/pci/aspm/aspm.c --- fwts-16.02.00/src/pci/aspm/aspm.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/pci/aspm/aspm.c 2016-03-14 09:10:20.000000000 +0000 @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ +#include "fwts.h" + +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -29,7 +33,6 @@ #include #include #include -#include "fwts.h" /* PCI Express Capability Structure Fields */ #define FWTS_PCIE_ASPM_SUPPORT_L0_FIELD 0x0400 @@ -278,3 +281,5 @@ }; FWTS_REGISTER("aspm", &aspm_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV) + +#endif diff -Nru fwts-16.02.00/src/uefi/esrt/esrt.c fwts-16.03.00/src/uefi/esrt/esrt.c --- fwts-16.02.00/src/uefi/esrt/esrt.c 1970-01-01 00:00:00.000000000 +0000 +++ fwts-16.03.00/src/uefi/esrt/esrt.c 2016-03-14 09:10:20.000000000 +0000 @@ -0,0 +1,268 @@ +/* + * Copyright (C) 2016 Canonical + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#include "fwts.h" + +#if defined(FWTS_HAS_UEFI) + +#include +#include +#include +#include + +#include "fwts_uefi.h" + +#define FWTS_ESRT_DIR_PATH "/sys/firmware/efi/esrt" +#define FWTS_ESRT_ENTRY_PATH "/sys/firmware/efi/esrt/entries" +#define FWTS_ESRT_RES_COUNT_PATH "/sys/firmware/efi/esrt/fw_resource_count" +#define FWTS_ESRT_RES_COUNT_MAX_PATH "/sys/firmware/efi/esrt/fw_resource_count_max" +#define FWTS_ESRT_RES_VERSION_PATH "/sys/firmware/efi/esrt/fw_resource_version" + +/* Current Entry Version */ +#define ESRT_FIRMWARE_RESOURCE_VERSION 1 + +static int esrt_init(fwts_framework *fw) +{ + + if (fwts_firmware_detect() != FWTS_FIRMWARE_UEFI) { + fwts_log_info(fw, "Cannot detect any UEFI firmware. Aborted."); + return FWTS_ABORTED; + } + + DIR *dir = opendir(FWTS_ESRT_DIR_PATH); + + if (dir) { + /* Directory exists. */ + closedir(dir); + return FWTS_OK; + } else if (ENOENT == errno) { + /* Directory does not exist. */ + fwts_log_info(fw, "Cannot find ESRT table, firmware seems not supported. Aborted."); + return FWTS_ABORTED; + } else { + /* opendir() failed for some other reason. */ + fwts_log_info(fw, "Cannot open ESRT directory on /sys/firmware/efi/, Aborted."); + return FWTS_ABORTED; + } +} + +static void check_entries(fwts_framework *fw, bool *passed) +{ + + DIR *dir; + struct dirent *entry; + bool entry_found = false; + + if (!(dir = opendir(FWTS_ESRT_ENTRY_PATH))) { + fwts_failed(fw, LOG_LEVEL_MEDIUM, "CannotOpenDir", + "Cannot open directory %s", FWTS_ESRT_ENTRY_PATH); + *passed = false; + return; + } + + do { + entry = readdir(dir); + if (entry && strstr(entry->d_name, "entry")) { + char path[PATH_MAX]; + char *str; + uint32_t fwversion; + uint32_t lowest_sp_fwversion; + bool fwversions_found = true; + + entry_found = true; + + snprintf(path, sizeof(path), FWTS_ESRT_ENTRY_PATH "/%s/fw_class", entry->d_name); + if ((str = fwts_get(path)) == NULL) { + fwts_failed(fw, LOG_LEVEL_MEDIUM, "CannotGetFwClass", + "Missing or failed to get FwClass on %s.", entry->d_name); + *passed = false; + } else + free(str); + + snprintf(path, sizeof(path), FWTS_ESRT_ENTRY_PATH "/%s/fw_type", entry->d_name); + if ((str = fwts_get(path)) == NULL) { + fwts_failed(fw, LOG_LEVEL_MEDIUM, "CannotGetFwType", + "Missing or failed to get FwType on %s.", entry->d_name); + *passed = false; + } else { + uint32_t fwtype = strtoul(str, NULL, 10); + + if (fwtype > ESRT_FW_TYPE_UEFIDRIVER) { + fwts_failed(fw, LOG_LEVEL_MEDIUM, "InvalidValue", + "The FwType value on %s is %" PRIu32 + ", which is undefined on UEFI Spec." + , entry->d_name, fwtype); + *passed = false; + } + free(str); + } + snprintf(path, sizeof(path), FWTS_ESRT_ENTRY_PATH "/%s/fw_version", entry->d_name); + if ((str = fwts_get(path)) == NULL) { + fwts_failed(fw, LOG_LEVEL_MEDIUM, "CannotGetFwVersion", + "Missing or failed to get FwVersion on %s.", entry->d_name); + *passed = false; + fwversions_found = false; + } else { + fwversion = strtoul(str, NULL, 10); + free(str); + } + + snprintf(path, sizeof(path), FWTS_ESRT_ENTRY_PATH "/%s/lowest_supported_fw_version", entry->d_name); + if ((str = fwts_get(path)) == NULL) { + fwts_failed(fw, LOG_LEVEL_MEDIUM, "CannotGetLowestSupportedFwVersion", + "Missing or failed to get LowestSupportedFwVersion on %s.", entry->d_name); + *passed = false; + fwversions_found = false; + } else { + lowest_sp_fwversion = strtoul(str, NULL, 10); + free(str); + } + + if (fwversions_found) + if (fwversion < lowest_sp_fwversion) { + fwts_failed(fw, LOG_LEVEL_MEDIUM, "InvalidValue", + "The FwVersion is %" PRIu32 + ", the LowestSupportedFwVersion is %" PRIu32 + ", FwVersion shouldn't lower than the " + "LowestSupportedFwVersion on %s." + , fwversion, lowest_sp_fwversion, entry->d_name); + *passed = false; + } + + snprintf(path, sizeof(path), FWTS_ESRT_ENTRY_PATH "/%s/capsule_flags", entry->d_name); + if ((str = fwts_get(path)) == NULL) { + fwts_failed(fw, LOG_LEVEL_MEDIUM, "CannotGetCapsuleFlags", + "Missing or failed to get CapsuleFlags on %s.", entry->d_name); + *passed = false; + } else + free(str); + + snprintf(path, sizeof(path), FWTS_ESRT_ENTRY_PATH "/%s/last_attempt_version", entry->d_name); + if ((str = fwts_get(path)) == NULL) { + fwts_failed(fw, LOG_LEVEL_MEDIUM, "CannotGetLastAttemptVersion", + "Missing or failed to get LastAttemptVersion on %s.", entry->d_name); + *passed = false; + } else + free(str); + + snprintf(path, sizeof(path), FWTS_ESRT_ENTRY_PATH "/%s/last_attempt_status", entry->d_name); + if ((str = fwts_get(path)) == NULL) { + fwts_failed(fw, LOG_LEVEL_MEDIUM, "CannotGetLastAttemptStatus", + "Missing or failed to get LastAttemptStatus on %s.", entry->d_name); + *passed = false; + } else { + uint32_t lastattemptst = strtoul(str, NULL, 10); + + if (lastattemptst > LAST_ATTEMPT_STATUS_ERR_PWR_EVT_BATT) { + fwts_failed(fw, LOG_LEVEL_MEDIUM, "InvalidValue", + "The LastAttemptStatus value on %s is %" PRIu32 + ", which is undefined on UEFI Spec." + , entry->d_name, lastattemptst); + *passed = false; + } + } + } + } while (entry); + + if (!entry_found) { + fwts_failed(fw, LOG_LEVEL_MEDIUM, "CannotFindEntries", + "Cannot find any entries on directory %s", FWTS_ESRT_ENTRY_PATH); + *passed = false; + } + + closedir(dir); + + return; + +} + +static int esrt_test1(fwts_framework *fw) +{ + char *str; + uint32_t count = 0; + uint32_t countmax = 0; + bool passed = true; + + if ((str = fwts_get(FWTS_ESRT_RES_COUNT_PATH)) == NULL) { + fwts_failed(fw, LOG_LEVEL_MEDIUM, "CannotGetCount", "Failed to get FwResourceCount."); + passed = false; + } else { + count = strtoul(str, NULL, 10); + if (count == 0) { + fwts_failed(fw, LOG_LEVEL_MEDIUM, "InvalidValue", + "The FwResourceCount value should not be 0."); + passed = false; + } + free(str); + } + + if ((str = fwts_get(FWTS_ESRT_RES_COUNT_MAX_PATH)) == NULL) { + fwts_failed(fw, LOG_LEVEL_MEDIUM, "CannotGetCountMax", "Failed to get FwResourceCount."); + passed = false; + } else { + countmax = strtoul(str, NULL, 10); + if (countmax == 0) + fwts_failed(fw, LOG_LEVEL_MEDIUM, "InvalidValue", + "The FwResourceCountMax value should not be 0."); + free(str); + } + + if (count > countmax) { + fwts_failed(fw, LOG_LEVEL_MEDIUM, "InvalidValue", + "The FwResourceCount shouldn't be larger than FwResourceCountMax."); + passed = false; + } + + if ((str = fwts_get(FWTS_ESRT_RES_VERSION_PATH)) == NULL) { + fwts_failed(fw, LOG_LEVEL_MEDIUM, "CannotGetVersion", "Failed to get FwResourceVersion."); + passed = false; + } else { + uint64_t version = strtoull(str, NULL, 10); + + if (version != ESRT_FIRMWARE_RESOURCE_VERSION) { + fwts_failed(fw, LOG_LEVEL_MEDIUM, "InvalidVersion", + "The FwResourceVersion is %" PRIu64 + ", should be the same as current entries version 1." + , version); + passed = false; + } + free(str); + } + + check_entries(fw, &passed); + if (passed) + fwts_passed(fw, "No issues found in ESRT table."); + return FWTS_OK; + +} + +static fwts_framework_minor_test esrt_tests[] = { + { esrt_test1, "Sanity check UEFI ESRT Table." }, + { NULL, NULL } +}; + +static fwts_framework_ops esrt_ops = { + .description = "Sanity check UEFI ESRT Table.", + .init = esrt_init, + .minor_tests = esrt_tests +}; + +FWTS_REGISTER("esrt", &esrt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_ROOT_PRIV) + +#endif diff -Nru fwts-16.02.00/src/uefi/esrtdump/esrtdump.c fwts-16.03.00/src/uefi/esrtdump/esrtdump.c --- fwts-16.02.00/src/uefi/esrtdump/esrtdump.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/uefi/esrtdump/esrtdump.c 2016-03-14 09:10:20.000000000 +0000 @@ -16,11 +16,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ +#include "fwts.h" + +#if defined(FWTS_HAS_UEFI) #include #include -#include "fwts.h" #include "fwts_uefi.h" #define FWTS_ESRT_DIR_PATH "/sys/firmware/efi/esrt/entries" @@ -205,3 +207,5 @@ }; FWTS_REGISTER("esrtdump", &esrtdump_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UTILS | FWTS_FLAG_ROOT_PRIV) + +#endif diff -Nru fwts-16.02.00/src/uefi/securebootcert/securebootcert.c fwts-16.03.00/src/uefi/securebootcert/securebootcert.c --- fwts-16.02.00/src/uefi/securebootcert/securebootcert.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/uefi/securebootcert/securebootcert.c 2016-03-14 09:10:20.000000000 +0000 @@ -16,10 +16,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ +#include "fwts.h" + +#if defined(FWTS_HAS_UEFI) + #include #include -#include "fwts.h" #include "fwts_uefi.h" #include "sbkeydefs.h" @@ -400,3 +403,5 @@ }; FWTS_REGISTER("securebootcert", &securebootcert_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV) + +#endif diff -Nru fwts-16.02.00/src/uefi/uefibootpath/uefibootpath.c fwts-16.03.00/src/uefi/uefibootpath/uefibootpath.c --- fwts-16.02.00/src/uefi/uefibootpath/uefibootpath.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/uefi/uefibootpath/uefibootpath.c 2016-03-14 09:10:20.000000000 +0000 @@ -16,12 +16,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ +#include "fwts.h" + +#if defined(FWTS_HAS_UEFI) #include #include #include -#include "fwts.h" #include "fwts_uefi.h" static int errors; @@ -888,3 +890,5 @@ }; FWTS_REGISTER("uefibootpath", &uefibootpath_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV); + +#endif diff -Nru fwts-16.02.00/src/uefi/uefidump/uefidump.c fwts-16.03.00/src/uefi/uefidump/uefidump.c --- fwts-16.02.00/src/uefi/uefidump/uefidump.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/uefi/uefidump/uefidump.c 2016-03-14 09:10:20.000000000 +0000 @@ -16,11 +16,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ +#include "fwts.h" + +#if defined(FWTS_HAS_UEFI) + #include #include #include -#include "fwts.h" #include "fwts_uefi.h" @@ -1500,3 +1503,5 @@ }; FWTS_REGISTER("uefidump", &uefidump_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UTILS | FWTS_FLAG_ROOT_PRIV) + +#endif diff -Nru fwts-16.02.00/src/uefi/uefirtauthvar/uefirtauthvar.c fwts-16.03.00/src/uefi/uefirtauthvar/uefirtauthvar.c --- fwts-16.02.00/src/uefi/uefirtauthvar/uefirtauthvar.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/uefi/uefirtauthvar/uefirtauthvar.c 2016-03-14 09:10:20.000000000 +0000 @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ +#include "fwts.h" + +#if defined(FWTS_HAS_UEFI) #include #include @@ -23,7 +26,6 @@ #include #include -#include "fwts.h" #include "fwts_uefi.h" #include "efi_runtime.h" #include "fwts_efi_module.h" @@ -266,7 +268,7 @@ fwts_failed(fw, LOG_LEVEL_MEDIUM, "UEFISetSameAuthVar", "Set authenticated variable fail"); - fwts_uefi_print_status_info(fw, status); + fwts_uefi_print_status_info(fw, status); } fwts_failed(fw, LOG_LEVEL_HIGH, @@ -306,7 +308,7 @@ fwts_failed(fw, LOG_LEVEL_MEDIUM, "UEFISetDiffAuthVar", "Set different valid authenticated variable fail"); - fwts_uefi_print_status_info(fw, status); + fwts_uefi_print_status_info(fw, status); } fwts_failed(fw, LOG_LEVEL_HIGH, @@ -374,17 +376,17 @@ if (i < sizeof(AuthVarCreateData)) { if (data[i] != AuthVarCreateData[i]) { fwts_failed(fw, LOG_LEVEL_HIGH, - "UEFIAppendAuthVar", - "Get authenticated variable data are not the " - "same as it set."); + "UEFIAppendAuthVar", + "Get authenticated variable data are not the " + "same as it set."); return FWTS_ERROR; } } else { if (data[i] != AuthVarAppendData[i - sizeof(AuthVarCreateData)]) { fwts_failed(fw, LOG_LEVEL_HIGH, - "UEFIAppendAuthVar", - "Get authenticated variable data are not the " - "same as it set."); + "UEFIAppendAuthVar", + "Get authenticated variable data are not the " + "same as it set."); return FWTS_ERROR; } } @@ -498,7 +500,7 @@ fwts_failed(fw, LOG_LEVEL_MEDIUM, "UEFISetOldAuthVar", "Set authenticated variable fail"); - fwts_uefi_print_status_info(fw, status); + fwts_uefi_print_status_info(fw, status); } fwts_failed(fw, LOG_LEVEL_HIGH, @@ -589,7 +591,7 @@ fwts_failed(fw, LOG_LEVEL_MEDIUM, "UEFISetAuthVarInvalidData", "Set authenticated variable fail"); - fwts_uefi_print_status_info(fw, status); + fwts_uefi_print_status_info(fw, status); } fwts_failed(fw, LOG_LEVEL_HIGH, @@ -624,7 +626,7 @@ fwts_failed(fw, LOG_LEVEL_MEDIUM, "UEFISetAuthVarInvalidTime", "Set authenticated variable fail"); - fwts_uefi_print_status_info(fw, status); + fwts_uefi_print_status_info(fw, status); } fwts_failed(fw, LOG_LEVEL_HIGH, @@ -660,7 +662,7 @@ fwts_failed(fw, LOG_LEVEL_MEDIUM, "UEFISetAuthVarDiffGuid", "Set authenticated variable fail"); - fwts_uefi_print_status_info(fw, status); + fwts_uefi_print_status_info(fw, status); } fwts_failed(fw, LOG_LEVEL_HIGH, @@ -703,7 +705,7 @@ fwts_failed(fw, LOG_LEVEL_MEDIUM, "UEFISetAuthVarInvalidAttr", "Set authenticated variable fail"); - fwts_uefi_print_status_info(fw, status); + fwts_uefi_print_status_info(fw, status); } fwts_failed(fw, LOG_LEVEL_HIGH, @@ -764,10 +766,10 @@ for (i = 0; i < sizeof(AuthVarCreateData); i++) { if (data[i] != AuthVarCreateData[i]) { fwts_failed(fw, LOG_LEVEL_HIGH, - "UEFISetAuthVarDiff", - "Get authenticated variable data are not the " - "same as it set."); - return FWTS_ERROR; + "UEFISetAuthVarDiff", + "Get authenticated variable data are not the " + "same as it set."); + return FWTS_ERROR; } } @@ -836,3 +838,5 @@ }; FWTS_REGISTER("uefirtauthvar", &uefirtauthvar_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV) + +#endif diff -Nru fwts-16.02.00/src/uefi/uefirtmisc/uefirtmisc.c fwts-16.03.00/src/uefi/uefirtmisc/uefirtmisc.c --- fwts-16.02.00/src/uefi/uefirtmisc/uefirtmisc.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/uefi/uefirtmisc/uefirtmisc.c 2016-03-14 09:10:20.000000000 +0000 @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ +#include "fwts.h" + +#if defined(FWTS_HAS_UEFI) #include #include @@ -23,7 +26,6 @@ #include #include -#include "fwts.h" #include "fwts_uefi.h" #include "efi_runtime.h" #include "fwts_efi_module.h" @@ -253,3 +255,5 @@ }; FWTS_REGISTER("uefirtmisc", &uefirtmisc_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV) + +#endif diff -Nru fwts-16.02.00/src/uefi/uefirttime/uefirttime.c fwts-16.03.00/src/uefi/uefirttime/uefirttime.c --- fwts-16.02.00/src/uefi/uefirttime/uefirttime.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/uefi/uefirttime/uefirttime.c 2016-03-14 09:10:20.000000000 +0000 @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ +#include "fwts.h" + +#if defined(FWTS_HAS_UEFI) #include #include @@ -23,7 +26,6 @@ #include #include -#include "fwts.h" #include "fwts_uefi.h" #include "efi_runtime.h" #include "fwts_efi_module.h" @@ -1130,3 +1132,5 @@ }; FWTS_REGISTER("uefirttime", &uefirttime_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV) + +#endif diff -Nru fwts-16.02.00/src/uefi/uefirtvariable/uefirtvariable.c fwts-16.03.00/src/uefi/uefirtvariable/uefirtvariable.c --- fwts-16.02.00/src/uefi/uefirtvariable/uefirtvariable.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/uefi/uefirtvariable/uefirtvariable.c 2016-03-14 09:10:20.000000000 +0000 @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ +#include "fwts.h" + +#if defined(FWTS_HAS_UEFI) #include #include @@ -23,7 +26,6 @@ #include #include -#include "fwts.h" #include "fwts_uefi.h" #include "efi_runtime.h" #include "fwts_efi_module.h" @@ -671,7 +673,7 @@ uint16_t *tmp; tmp = realloc(variablename, sizeof(uint16_t) * variablenamesize); - if (tmp) { + if (tmp) { variablename = tmp; getnextvariablename.VariableName = variablename; maxvariablenamesize = variablenamesize; @@ -1343,24 +1345,24 @@ attr = attributes | FWTS_UEFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS | FWTS_UEFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS; ret = setvariable_invalidattr(fw, attr, datasize, variablenametest, >estguid1, datadiff); - if (ret == FWTS_ERROR) { - fwts_failed(fw, LOG_LEVEL_MEDIUM, "UEFIRuntimeSetVariable", - "Successfully set variable with both authenticated (EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS " - "EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS) attributes are set, expected fail."); - setvariable_insertvariable(fw, 0, datasize, variablenametest, >estguid1, datadiff); - return FWTS_ERROR; - } + if (ret == FWTS_ERROR) { + fwts_failed(fw, LOG_LEVEL_MEDIUM, "UEFIRuntimeSetVariable", + "Successfully set variable with both authenticated (EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS " + "EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS) attributes are set, expected fail."); + setvariable_insertvariable(fw, 0, datasize, variablenametest, >estguid1, datadiff); + return FWTS_ERROR; + } - if (setvariable_checkvariable_notfound(fw, variablenametest, - >estguid1) == FWTS_ERROR) { - fwts_log_info(fw, - "Get the variable which is set by SetVariable with both " - "authenticated (EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS " - "EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS) " - "attributes are set %" PRIu32 " , test failed.", attr); - setvariable_insertvariable(fw, 0, datasize, variablenametest, >estguid1, datadiff); - return FWTS_ERROR; - } + if (setvariable_checkvariable_notfound(fw, variablenametest, + >estguid1) == FWTS_ERROR) { + fwts_log_info(fw, + "Get the variable which is set by SetVariable with both " + "authenticated (EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS " + "EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS) " + "attributes are set %" PRIu32 " , test failed.", attr); + setvariable_insertvariable(fw, 0, datasize, variablenametest, >estguid1, datadiff); + return FWTS_ERROR; + } return FWTS_OK; } @@ -1976,3 +1978,5 @@ }; FWTS_REGISTER("uefirtvariable", &uefirtvariable_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV) + +#endif diff -Nru fwts-16.02.00/src/uefi/uefivarinfo/uefivarinfo.c fwts-16.03.00/src/uefi/uefivarinfo/uefivarinfo.c --- fwts-16.02.00/src/uefi/uefivarinfo/uefivarinfo.c 2016-02-25 07:49:45.000000000 +0000 +++ fwts-16.03.00/src/uefi/uefivarinfo/uefivarinfo.c 2016-03-14 09:10:20.000000000 +0000 @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ +#include "fwts.h" + +#if defined(FWTS_HAS_UEFI) #include #include @@ -23,7 +26,6 @@ #include #include -#include "fwts.h" #include "fwts_uefi.h" #include "efi_runtime.h" #include "fwts_efi_module.h" @@ -247,3 +249,5 @@ }; FWTS_REGISTER("uefivarinfo", &uefivarinfo_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UTILS | FWTS_FLAG_ROOT_PRIV) + +#endif