[PATCH 2/4] Add s390x build support: skip tests that are not build in for this arch

ivanhu ivan.hu at canonical.com
Thu Mar 3 09:24:19 UTC 2016



On 2016年02月26日 19:42, Colin King wrote:
> From: Colin Ian King <colin.king at canonical.com>
>
> The s390x architecture has a considerable amount of tests that are
> not built in, so we need to check if these tests exist before running
> a regression test on them.  If the test does not exist, skip it.
>
> Signed-off-by: Colin Ian King <colin.king at canonical.com>
> ---
>   fwts-test/acpidump-0001/test-0001.sh       | 6 ++++++
>   fwts-test/acpitables-0001/test-0001.sh     | 6 ++++++
>   fwts-test/arg-help-0001/test-0001.sh       | 2 +-
>   fwts-test/arg-help-0001/test-0002.sh       | 2 +-
>   fwts-test/arg-table-path-0001/test-0001.sh | 7 +++++++
>   fwts-test/arg-table-path-0001/test-0002.sh | 7 +++++++
>   fwts-test/asf-0001/test-0001.sh            | 6 ++++++
>   fwts-test/asf-0001/test-0002.sh            | 6 ++++++
>   fwts-test/aspt-0001/test-0001.sh           | 6 ++++++
>   fwts-test/aspt-0001/test-0002.sh           | 6 ++++++
>   fwts-test/bert-0001/test-0001.sh           | 6 ++++++
>   fwts-test/bert-0001/test-0002.sh           | 6 ++++++
>   fwts-test/bgrt-0001/test-0001.sh           | 6 ++++++
>   fwts-test/bgrt-0001/test-0002.sh           | 8 +++++++-
>   fwts-test/boot-0001/test-0001.sh           | 6 ++++++
>   fwts-test/boot-0001/test-0002.sh           | 6 ++++++
>   fwts-test/checksum-0001/test-0001.sh       | 6 ++++++
>   fwts-test/checksum-0001/test-0003.sh       | 6 ++++++
>   fwts-test/checksum-0001/test-0004.sh       | 6 ++++++
>   fwts-test/cpep-0001/test-0001.sh           | 6 ++++++
>   fwts-test/cpep-0001/test-0002.sh           | 6 ++++++
>   fwts-test/csrt-0001/test-0001.sh           | 6 ++++++
>   fwts-test/csrt-0001/test-0002.sh           | 6 ++++++
>   fwts-test/dbg2-0001/test-0001.sh           | 6 ++++++
>   fwts-test/dbg2-0001/test-0002.sh           | 6 ++++++
>   fwts-test/dbgp-0001/test-0001.sh           | 6 ++++++
>   fwts-test/dbgp-0001/test-0002.sh           | 6 ++++++
>   fwts-test/disassemble-0001/test-0001.sh    | 6 ++++++
>   fwts-test/erst-0001/test-0001.sh           | 6 ++++++
>   fwts-test/erst-0001/test-0002.sh           | 6 ++++++
>   fwts-test/erst-0001/test-0003.sh           | 6 ++++++
>   fwts-test/facs-0001/test-0001.sh           | 6 ++++++
>   fwts-test/facs-0001/test-0002.sh           | 6 ++++++
>   fwts-test/fpdt-0001/test-0001.sh           | 6 ++++++
>   fwts-test/fpdt-0001/test-0002.sh           | 6 ++++++
>   fwts-test/hest-0001/test-0001.sh           | 6 ++++++
>   fwts-test/hest-0001/test-0002.sh           | 6 ++++++
>   fwts-test/iort-0001/test-0001.sh           | 6 ++++++
>   fwts-test/iort-0001/test-0002.sh           | 6 ++++++
>   fwts-test/lpit-0001/test-0001.sh           | 6 ++++++
>   fwts-test/lpit-0001/test-0002.sh           | 6 ++++++
>   fwts-test/madt-0001/test-0001.sh           | 6 ++++++
>   fwts-test/madt-0001/test-0002.sh           | 6 ++++++
>   fwts-test/mchi-0001/test-0001.sh           | 6 ++++++
>   fwts-test/mchi-0001/test-0002.sh           | 6 ++++++
>   fwts-test/method-0001/test-0001.sh         | 6 ++++++
>   fwts-test/msdm-0001/test-0001.sh           | 6 ++++++
>   fwts-test/msdm-0001/test-0002.sh           | 6 ++++++
>   fwts-test/rsdt-0001/test-0001.sh           | 6 ++++++
>   fwts-test/sbst-0001/test-0001.sh           | 6 ++++++
>   fwts-test/sbst-0001/test-0002.sh           | 6 ++++++
>   fwts-test/slic-0001/test-0001.sh           | 6 ++++++
>   fwts-test/slic-0001/test-0002.sh           | 6 ++++++
>   fwts-test/slit-0001/test-0001.sh           | 6 ++++++
>   fwts-test/slit-0001/test-0002.sh           | 6 ++++++
>   fwts-test/spcr-0001/test-0001.sh           | 6 ++++++
>   fwts-test/spcr-0001/test-0002.sh           | 6 ++++++
>   fwts-test/srat-0001/test-0001.sh           | 6 ++++++
>   fwts-test/srat-0001/test-0002.sh           | 6 ++++++
>   fwts-test/stao-0001/test-0001.sh           | 6 ++++++
>   fwts-test/stao-0001/test-0002.sh           | 6 ++++++
>   fwts-test/syntaxcheck-0001/test-0001.sh    | 6 ++++++
>   fwts-test/tcpa-0001/test-0001.sh           | 6 ++++++
>   fwts-test/tcpa-0001/test-0002.sh           | 6 ++++++
>   fwts-test/tpm2-0001/test-0001.sh           | 6 ++++++
>   fwts-test/tpm2-0001/test-0002.sh           | 6 ++++++
>   fwts-test/uefi-0001/test-0001.sh           | 6 ++++++
>   fwts-test/uefi-0001/test-0002.sh           | 6 ++++++
>   fwts-test/waet-0001/test-0001.sh           | 6 ++++++
>   fwts-test/waet-0001/test-0002.sh           | 6 ++++++
>   fwts-test/waet-0001/test-0003.sh           | 6 ++++++
>   fwts-test/wdat-0001/test-0001.sh           | 6 ++++++
>   fwts-test/wdat-0001/test-0002.sh           | 6 ++++++
>   fwts-test/xenv-0001/test-0001.sh           | 7 +++++++
>   fwts-test/xenv-0001/test-0002.sh           | 6 ++++++
>   fwts-test/xsdt-0001/test-0001.sh           | 6 ++++++
>   76 files changed, 450 insertions(+), 3 deletions(-)
>
> diff --git a/fwts-test/acpidump-0001/test-0001.sh b/fwts-test/acpidump-0001/test-0001.sh
> index 94b3cdd..20347d8 100755
> --- a/fwts-test/acpidump-0001/test-0001.sh
> +++ b/fwts-test/acpidump-0001/test-0001.sh
> @@ -4,6 +4,12 @@ TEST="Test acpidump against known ACPI tables"
>   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 --git a/fwts-test/acpitables-0001/test-0001.sh b/fwts-test/acpitables-0001/test-0001.sh
> index f349698..1f1aa9c 100755
> --- a/fwts-test/acpitables-0001/test-0001.sh
> +++ b/fwts-test/acpitables-0001/test-0001.sh
> @@ -4,6 +4,12 @@ TEST="Test apcitables against known correct ACPI tables"
>   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 --git a/fwts-test/arg-help-0001/test-0001.sh b/fwts-test/arg-help-0001/test-0001.sh
> index cff5593..846707d 100755
> --- a/fwts-test/arg-help-0001/test-0001.sh
> +++ b/fwts-test/arg-help-0001/test-0001.sh
> @@ -8,7 +8,7 @@ HERE=`pwd`
>   #
>   #  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 --git a/fwts-test/arg-help-0001/test-0002.sh b/fwts-test/arg-help-0001/test-0002.sh
> index 99e3c76..a144c44 100755
> --- a/fwts-test/arg-help-0001/test-0002.sh
> +++ b/fwts-test/arg-help-0001/test-0002.sh
> @@ -8,7 +8,7 @@ HERE=`pwd`
>   #
>   #  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 --git a/fwts-test/arg-table-path-0001/test-0001.sh b/fwts-test/arg-table-path-0001/test-0001.sh
> index b97d905..b2006f9 100755
> --- a/fwts-test/arg-table-path-0001/test-0001.sh
> +++ b/fwts-test/arg-table-path-0001/test-0001.sh
> @@ -4,6 +4,13 @@ TEST="Test --table-path to load dumped tables produced by acpixtract"
>   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 --git a/fwts-test/arg-table-path-0001/test-0002.sh b/fwts-test/arg-table-path-0001/test-0002.sh
> index cd3548c..0ae6ddf 100755
> --- a/fwts-test/arg-table-path-0001/test-0002.sh
> +++ b/fwts-test/arg-table-path-0001/test-0002.sh
> @@ -4,6 +4,13 @@ TEST="Test -t to load dumped tables produced by acpixtract"
>   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 --git a/fwts-test/asf-0001/test-0001.sh b/fwts-test/asf-0001/test-0001.sh
> index aacad01..51db6ab 100755
> --- a/fwts-test/asf-0001/test-0001.sh
> +++ b/fwts-test/asf-0001/test-0001.sh
> @@ -4,6 +4,12 @@ TEST="Test apci table against ASF!"
>   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 --git a/fwts-test/asf-0001/test-0002.sh b/fwts-test/asf-0001/test-0002.sh
> index 2cf32ce..3394b26 100755
> --- a/fwts-test/asf-0001/test-0002.sh
> +++ b/fwts-test/asf-0001/test-0002.sh
> @@ -4,6 +4,12 @@ TEST="Test apci against invalid ASF!"
>   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 --git a/fwts-test/aspt-0001/test-0001.sh b/fwts-test/aspt-0001/test-0001.sh
> index 1aa316b..ab5decd 100755
> --- a/fwts-test/aspt-0001/test-0001.sh
> +++ b/fwts-test/aspt-0001/test-0001.sh
> @@ -4,6 +4,12 @@ TEST="Test apcitables against ASPT"
>   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 --git a/fwts-test/aspt-0001/test-0002.sh b/fwts-test/aspt-0001/test-0002.sh
> index 3c379bd..48b7f16 100755
> --- a/fwts-test/aspt-0001/test-0002.sh
> +++ b/fwts-test/aspt-0001/test-0002.sh
> @@ -4,6 +4,12 @@ TEST="Test apcitables against invalid ASPT"
>   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 --git a/fwts-test/bert-0001/test-0001.sh b/fwts-test/bert-0001/test-0001.sh
> index eb39364..e87a548 100755
> --- a/fwts-test/bert-0001/test-0001.sh
> +++ b/fwts-test/bert-0001/test-0001.sh
> @@ -4,6 +4,12 @@ TEST="Test apcitables against BERT"
>   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 --git a/fwts-test/bert-0001/test-0002.sh b/fwts-test/bert-0001/test-0002.sh
> index c2ee591..5df3e29 100755
> --- a/fwts-test/bert-0001/test-0002.sh
> +++ b/fwts-test/bert-0001/test-0002.sh
> @@ -4,6 +4,12 @@ TEST="Test apcitables against invalid BERT"
>   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 --git a/fwts-test/bgrt-0001/test-0001.sh b/fwts-test/bgrt-0001/test-0001.sh
> index 518687b..f846219 100755
> --- a/fwts-test/bgrt-0001/test-0001.sh
> +++ b/fwts-test/bgrt-0001/test-0001.sh
> @@ -4,6 +4,12 @@ TEST="Test apcitables against 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-0001.log bgrt - | cut -c7- | grep "^bgrt" > $TMPLOG
>   diff $TMPLOG $FWTSTESTDIR/bgrt-0001/bgrt-0001.log >> $FAILURE_LOG
>   ret=$?
> diff --git a/fwts-test/bgrt-0001/test-0002.sh b/fwts-test/bgrt-0001/test-0002.sh
> index 5e0c6ab..cab8c73 100755
> --- a/fwts-test/bgrt-0001/test-0002.sh
> +++ b/fwts-test/bgrt-0001/test-0002.sh
> @@ -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 --git a/fwts-test/boot-0001/test-0001.sh b/fwts-test/boot-0001/test-0001.sh
> index f9a6307..676b24d 100755
> --- a/fwts-test/boot-0001/test-0001.sh
> +++ b/fwts-test/boot-0001/test-0001.sh
> @@ -4,6 +4,12 @@ TEST="Test apcitables against BOOT"
>   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 --git a/fwts-test/boot-0001/test-0002.sh b/fwts-test/boot-0001/test-0002.sh
> index ed0db5f..3f7e014 100755
> --- a/fwts-test/boot-0001/test-0002.sh
> +++ b/fwts-test/boot-0001/test-0002.sh
> @@ -4,6 +4,12 @@ TEST="Test apcitables against invalid BOOT"
>   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 --git a/fwts-test/checksum-0001/test-0001.sh b/fwts-test/checksum-0001/test-0001.sh
> index 49e9961..75fc1f9 100755
> --- a/fwts-test/checksum-0001/test-0001.sh
> +++ b/fwts-test/checksum-0001/test-0001.sh
> @@ -4,6 +4,12 @@ TEST="Test checksum against known correct ACPI tables"
>   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 --git a/fwts-test/checksum-0001/test-0003.sh b/fwts-test/checksum-0001/test-0003.sh
> index 62f58b3..12e2735 100755
> --- a/fwts-test/checksum-0001/test-0003.sh
> +++ b/fwts-test/checksum-0001/test-0003.sh
> @@ -4,6 +4,12 @@ TEST="Test checksum against incorrect ACPI DSDT table"
>   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 --git a/fwts-test/checksum-0001/test-0004.sh b/fwts-test/checksum-0001/test-0004.sh
> index f3fd350..cc3a429 100755
> --- a/fwts-test/checksum-0001/test-0004.sh
> +++ b/fwts-test/checksum-0001/test-0004.sh
> @@ -4,6 +4,12 @@ TEST="Test checksum against incorrect ACPI DSDT table"
>   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 --git a/fwts-test/cpep-0001/test-0001.sh b/fwts-test/cpep-0001/test-0001.sh
> index 2161da4..b3c625d 100755
> --- a/fwts-test/cpep-0001/test-0001.sh
> +++ b/fwts-test/cpep-0001/test-0001.sh
> @@ -4,6 +4,12 @@ TEST="Test table against CPEP"
>   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 --git a/fwts-test/cpep-0001/test-0002.sh b/fwts-test/cpep-0001/test-0002.sh
> index a0c249a..069915d 100755
> --- a/fwts-test/cpep-0001/test-0002.sh
> +++ b/fwts-test/cpep-0001/test-0002.sh
> @@ -4,6 +4,12 @@ TEST="Test table against invalid CPEP"
>   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 --git a/fwts-test/csrt-0001/test-0001.sh b/fwts-test/csrt-0001/test-0001.sh
> index 69797ce..eac1478 100755
> --- a/fwts-test/csrt-0001/test-0001.sh
> +++ b/fwts-test/csrt-0001/test-0001.sh
> @@ -4,6 +4,12 @@ TEST="Test table against CSRT"
>   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 --git a/fwts-test/csrt-0001/test-0002.sh b/fwts-test/csrt-0001/test-0002.sh
> index 1da7543..6e0deaa 100755
> --- a/fwts-test/csrt-0001/test-0002.sh
> +++ b/fwts-test/csrt-0001/test-0002.sh
> @@ -4,6 +4,12 @@ TEST="Test table against invalid CSRT"
>   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 --git a/fwts-test/dbg2-0001/test-0001.sh b/fwts-test/dbg2-0001/test-0001.sh
> index a5325fb..23d110c 100755
> --- a/fwts-test/dbg2-0001/test-0001.sh
> +++ b/fwts-test/dbg2-0001/test-0001.sh
> @@ -4,6 +4,12 @@ TEST="Test apcitables against DBG2"
>   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 --git a/fwts-test/dbg2-0001/test-0002.sh b/fwts-test/dbg2-0001/test-0002.sh
> index a61bc32..4feade6 100755
> --- a/fwts-test/dbg2-0001/test-0002.sh
> +++ b/fwts-test/dbg2-0001/test-0002.sh
> @@ -4,6 +4,12 @@ TEST="Test apcitables against invalid DBG2"
>   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 --git a/fwts-test/dbgp-0001/test-0001.sh b/fwts-test/dbgp-0001/test-0001.sh
> index 1ab179b..fa96fc6 100755
> --- a/fwts-test/dbgp-0001/test-0001.sh
> +++ b/fwts-test/dbgp-0001/test-0001.sh
> @@ -4,6 +4,12 @@ TEST="Test apcitables against DBGP"
>   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 --git a/fwts-test/dbgp-0001/test-0002.sh b/fwts-test/dbgp-0001/test-0002.sh
> index bc08a48..742655a 100755
> --- a/fwts-test/dbgp-0001/test-0002.sh
> +++ b/fwts-test/dbgp-0001/test-0002.sh
> @@ -4,6 +4,12 @@ TEST="Test apcitables against invalid DBGP"
>   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 --git a/fwts-test/disassemble-0001/test-0001.sh b/fwts-test/disassemble-0001/test-0001.sh
> index a4f95f2..54543a9 100755
> --- a/fwts-test/disassemble-0001/test-0001.sh
> +++ b/fwts-test/disassemble-0001/test-0001.sh
> @@ -6,6 +6,12 @@ TMPDIR=$TMP/disassemble-aml
>   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 --git a/fwts-test/erst-0001/test-0001.sh b/fwts-test/erst-0001/test-0001.sh
> index 5bbce6d..ae369b8 100755
> --- a/fwts-test/erst-0001/test-0001.sh
> +++ b/fwts-test/erst-0001/test-0001.sh
> @@ -4,6 +4,12 @@ TEST="Test table against ERST"
>   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 --git a/fwts-test/erst-0001/test-0002.sh b/fwts-test/erst-0001/test-0002.sh
> index 71d5db1..5e7b2d7 100755
> --- a/fwts-test/erst-0001/test-0002.sh
> +++ b/fwts-test/erst-0001/test-0002.sh
> @@ -4,6 +4,12 @@ TEST="Test table against invalid ERST"
>   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 --git a/fwts-test/erst-0001/test-0003.sh b/fwts-test/erst-0001/test-0003.sh
> index 5cb1982..8fa1118 100755
> --- a/fwts-test/erst-0001/test-0003.sh
> +++ b/fwts-test/erst-0001/test-0003.sh
> @@ -4,6 +4,12 @@ TEST="Test table against invalid ERST"
>   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 --git a/fwts-test/facs-0001/test-0001.sh b/fwts-test/facs-0001/test-0001.sh
> index 3bab3bf..5d6a3b4 100755
> --- a/fwts-test/facs-0001/test-0001.sh
> +++ b/fwts-test/facs-0001/test-0001.sh
> @@ -4,6 +4,12 @@ TEST="Test table against FACS"
>   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 --git a/fwts-test/facs-0001/test-0002.sh b/fwts-test/facs-0001/test-0002.sh
> index 7d75303..15936d3 100755
> --- a/fwts-test/facs-0001/test-0002.sh
> +++ b/fwts-test/facs-0001/test-0002.sh
> @@ -4,6 +4,12 @@ TEST="Test table against invalid FACS"
>   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 --git a/fwts-test/fpdt-0001/test-0001.sh b/fwts-test/fpdt-0001/test-0001.sh
> index 959d67b..7a0deb7 100755
> --- a/fwts-test/fpdt-0001/test-0001.sh
> +++ b/fwts-test/fpdt-0001/test-0001.sh
> @@ -4,6 +4,12 @@ TEST="Test table against FPDT"
>   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 --git a/fwts-test/fpdt-0001/test-0002.sh b/fwts-test/fpdt-0001/test-0002.sh
> index ac9d6c6..1699cf2 100755
> --- a/fwts-test/fpdt-0001/test-0002.sh
> +++ b/fwts-test/fpdt-0001/test-0002.sh
> @@ -4,6 +4,12 @@ TEST="Test table against FPDT"
>   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 --git a/fwts-test/hest-0001/test-0001.sh b/fwts-test/hest-0001/test-0001.sh
> index de943db..d223616 100755
> --- a/fwts-test/hest-0001/test-0001.sh
> +++ b/fwts-test/hest-0001/test-0001.sh
> @@ -4,6 +4,12 @@ TEST="Test apcitables against HEST"
>   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 --git a/fwts-test/hest-0001/test-0002.sh b/fwts-test/hest-0001/test-0002.sh
> index a1d9c9d..fd8c4a9 100755
> --- a/fwts-test/hest-0001/test-0002.sh
> +++ b/fwts-test/hest-0001/test-0002.sh
> @@ -4,6 +4,12 @@ TEST="Test apcitables against invalid HEST"
>   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 --git a/fwts-test/iort-0001/test-0001.sh b/fwts-test/iort-0001/test-0001.sh
> index 8c18dc1..a4e51b4 100755
> --- a/fwts-test/iort-0001/test-0001.sh
> +++ b/fwts-test/iort-0001/test-0001.sh
> @@ -4,6 +4,12 @@ TEST="Test apci table against IORT"
>   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 --git a/fwts-test/iort-0001/test-0002.sh b/fwts-test/iort-0001/test-0002.sh
> index dd1fe64..d81d6e1 100755
> --- a/fwts-test/iort-0001/test-0002.sh
> +++ b/fwts-test/iort-0001/test-0002.sh
> @@ -4,6 +4,12 @@ TEST="Test apci table against invalid IORT"
>   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 --git a/fwts-test/lpit-0001/test-0001.sh b/fwts-test/lpit-0001/test-0001.sh
> index a7366bd..685ca12 100755
> --- a/fwts-test/lpit-0001/test-0001.sh
> +++ b/fwts-test/lpit-0001/test-0001.sh
> @@ -4,6 +4,12 @@ TEST="Test apcitables against LPIT"
>   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 --git a/fwts-test/lpit-0001/test-0002.sh b/fwts-test/lpit-0001/test-0002.sh
> index 92ada71..3f4a1e0 100755
> --- a/fwts-test/lpit-0001/test-0002.sh
> +++ b/fwts-test/lpit-0001/test-0002.sh
> @@ -4,6 +4,12 @@ TEST="Test apcitables against invalid LPIT"
>   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 --git a/fwts-test/madt-0001/test-0001.sh b/fwts-test/madt-0001/test-0001.sh
> index fcbaf93..3d8dd18 100755
> --- a/fwts-test/madt-0001/test-0001.sh
> +++ b/fwts-test/madt-0001/test-0001.sh
> @@ -4,6 +4,12 @@ TEST="Test against known correct ACPI APIC tables"
>   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 --git a/fwts-test/madt-0001/test-0002.sh b/fwts-test/madt-0001/test-0002.sh
> index 05cee54..88b2736 100755
> --- a/fwts-test/madt-0001/test-0002.sh
> +++ b/fwts-test/madt-0001/test-0002.sh
> @@ -4,6 +4,12 @@ TEST="Test against known correct ACPI APIC tables"
>   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 --git a/fwts-test/mchi-0001/test-0001.sh b/fwts-test/mchi-0001/test-0001.sh
> index 20835f6..46766c0 100755
> --- a/fwts-test/mchi-0001/test-0001.sh
> +++ b/fwts-test/mchi-0001/test-0001.sh
> @@ -4,6 +4,12 @@ TEST="Test table against MCHI"
>   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 --git a/fwts-test/mchi-0001/test-0002.sh b/fwts-test/mchi-0001/test-0002.sh
> index 0081373..29e893c 100755
> --- a/fwts-test/mchi-0001/test-0002.sh
> +++ b/fwts-test/mchi-0001/test-0002.sh
> @@ -4,6 +4,12 @@ TEST="Test table against MCHI"
>   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 --git a/fwts-test/method-0001/test-0001.sh b/fwts-test/method-0001/test-0001.sh
> index b67c0ec..e0c52dd 100755
> --- a/fwts-test/method-0001/test-0001.sh
> +++ b/fwts-test/method-0001/test-0001.sh
> @@ -4,6 +4,12 @@ TEST="Test method against known correct ACPI tables"
>   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 --git a/fwts-test/msdm-0001/test-0001.sh b/fwts-test/msdm-0001/test-0001.sh
> index 3d34f02..7f4d145 100755
> --- a/fwts-test/msdm-0001/test-0001.sh
> +++ b/fwts-test/msdm-0001/test-0001.sh
> @@ -4,6 +4,12 @@ TEST="Test table against MSDM"
>   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 --git a/fwts-test/msdm-0001/test-0002.sh b/fwts-test/msdm-0001/test-0002.sh
> index 042bddb..6fa851d 100755
> --- a/fwts-test/msdm-0001/test-0002.sh
> +++ b/fwts-test/msdm-0001/test-0002.sh
> @@ -4,6 +4,12 @@ TEST="Test table against invalid MSDM"
>   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 --git a/fwts-test/rsdt-0001/test-0001.sh b/fwts-test/rsdt-0001/test-0001.sh
> index 373e4dd..21e6652 100755
> --- a/fwts-test/rsdt-0001/test-0001.sh
> +++ b/fwts-test/rsdt-0001/test-0001.sh
> @@ -4,6 +4,12 @@ TEST="Test apcitables against broken ACPI RSDT table"
>   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 --git a/fwts-test/sbst-0001/test-0001.sh b/fwts-test/sbst-0001/test-0001.sh
> index 40cb49e..80ed75d 100755
> --- a/fwts-test/sbst-0001/test-0001.sh
> +++ b/fwts-test/sbst-0001/test-0001.sh
> @@ -4,6 +4,12 @@ TEST="Test apcitables against SBST"
>   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 --git a/fwts-test/sbst-0001/test-0002.sh b/fwts-test/sbst-0001/test-0002.sh
> index 3ac3020..69a2b04 100755
> --- a/fwts-test/sbst-0001/test-0002.sh
> +++ b/fwts-test/sbst-0001/test-0002.sh
> @@ -4,6 +4,12 @@ TEST="Test apcitables against invalid SBST"
>   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 --git a/fwts-test/slic-0001/test-0001.sh b/fwts-test/slic-0001/test-0001.sh
> index 516b8cf..4b6facf 100755
> --- a/fwts-test/slic-0001/test-0001.sh
> +++ b/fwts-test/slic-0001/test-0001.sh
> @@ -4,6 +4,12 @@ TEST="Test table against SLIC"
>   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 --git a/fwts-test/slic-0001/test-0002.sh b/fwts-test/slic-0001/test-0002.sh
> index ef3284d..e5868b2 100755
> --- a/fwts-test/slic-0001/test-0002.sh
> +++ b/fwts-test/slic-0001/test-0002.sh
> @@ -4,6 +4,12 @@ TEST="Test table against invalid SLIC"
>   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 --git a/fwts-test/slit-0001/test-0001.sh b/fwts-test/slit-0001/test-0001.sh
> index b0f89e1..18cf6f2 100755
> --- a/fwts-test/slit-0001/test-0001.sh
> +++ b/fwts-test/slit-0001/test-0001.sh
> @@ -4,6 +4,12 @@ TEST="Test apcitables against SLIT"
>   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 --git a/fwts-test/slit-0001/test-0002.sh b/fwts-test/slit-0001/test-0002.sh
> index 1477459..b774c50 100755
> --- a/fwts-test/slit-0001/test-0002.sh
> +++ b/fwts-test/slit-0001/test-0002.sh
> @@ -4,6 +4,12 @@ TEST="Test apcitables against invalid SLIT"
>   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 --git a/fwts-test/spcr-0001/test-0001.sh b/fwts-test/spcr-0001/test-0001.sh
> index 6db64a0..3c5489d 100755
> --- a/fwts-test/spcr-0001/test-0001.sh
> +++ b/fwts-test/spcr-0001/test-0001.sh
> @@ -4,6 +4,12 @@ TEST="Test apcitables against SPCR"
>   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 --git a/fwts-test/spcr-0001/test-0002.sh b/fwts-test/spcr-0001/test-0002.sh
> index 1d8e232..7c70908 100755
> --- a/fwts-test/spcr-0001/test-0002.sh
> +++ b/fwts-test/spcr-0001/test-0002.sh
> @@ -4,6 +4,12 @@ TEST="Test apcitables against invalid SPCR"
>   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 --git a/fwts-test/srat-0001/test-0001.sh b/fwts-test/srat-0001/test-0001.sh
> index a5cc279..544d427 100755
> --- a/fwts-test/srat-0001/test-0001.sh
> +++ b/fwts-test/srat-0001/test-0001.sh
> @@ -4,6 +4,12 @@ TEST="Test apcitables against SRAT"
>   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 --git a/fwts-test/srat-0001/test-0002.sh b/fwts-test/srat-0001/test-0002.sh
> index b658d21..46af81d 100755
> --- a/fwts-test/srat-0001/test-0002.sh
> +++ b/fwts-test/srat-0001/test-0002.sh
> @@ -4,6 +4,12 @@ TEST="Test apcitables against invalid SRAT"
>   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 --git a/fwts-test/stao-0001/test-0001.sh b/fwts-test/stao-0001/test-0001.sh
> index baf5375..c789865 100755
> --- a/fwts-test/stao-0001/test-0001.sh
> +++ b/fwts-test/stao-0001/test-0001.sh
> @@ -4,6 +4,12 @@ TEST="Test apci table against STAO"
>   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 --git a/fwts-test/stao-0001/test-0002.sh b/fwts-test/stao-0001/test-0002.sh
> index 2efd264..ca5069a 100755
> --- a/fwts-test/stao-0001/test-0002.sh
> +++ b/fwts-test/stao-0001/test-0002.sh
> @@ -4,6 +4,12 @@ TEST="Test apci table against invalid STAO"
>   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 --git a/fwts-test/syntaxcheck-0001/test-0001.sh b/fwts-test/syntaxcheck-0001/test-0001.sh
> index 6ee730a..5af53dc 100755
> --- a/fwts-test/syntaxcheck-0001/test-0001.sh
> +++ b/fwts-test/syntaxcheck-0001/test-0001.sh
> @@ -4,6 +4,12 @@ TEST="Test syntaxcheck against known correct ACPI tables"
>   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 --git a/fwts-test/tcpa-0001/test-0001.sh b/fwts-test/tcpa-0001/test-0001.sh
> index ec71ce6..5bef23d 100755
> --- a/fwts-test/tcpa-0001/test-0001.sh
> +++ b/fwts-test/tcpa-0001/test-0001.sh
> @@ -4,6 +4,12 @@ TEST="Test table against TCPA"
>   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 --git a/fwts-test/tcpa-0001/test-0002.sh b/fwts-test/tcpa-0001/test-0002.sh
> index 8b5ee6e..284d223 100755
> --- a/fwts-test/tcpa-0001/test-0002.sh
> +++ b/fwts-test/tcpa-0001/test-0002.sh
> @@ -4,6 +4,12 @@ TEST="Test table against invalid TCPA"
>   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 --git a/fwts-test/tpm2-0001/test-0001.sh b/fwts-test/tpm2-0001/test-0001.sh
> index d583163..61f404d 100755
> --- a/fwts-test/tpm2-0001/test-0001.sh
> +++ b/fwts-test/tpm2-0001/test-0001.sh
> @@ -4,6 +4,12 @@ TEST="Test table against TPM2"
>   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 --git a/fwts-test/tpm2-0001/test-0002.sh b/fwts-test/tpm2-0001/test-0002.sh
> index 9923cd7..7bf69d9 100755
> --- a/fwts-test/tpm2-0001/test-0002.sh
> +++ b/fwts-test/tpm2-0001/test-0002.sh
> @@ -4,6 +4,12 @@ TEST="Test table against invalid TPM2"
>   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 --git a/fwts-test/uefi-0001/test-0001.sh b/fwts-test/uefi-0001/test-0001.sh
> index bed98e4..c799093 100755
> --- a/fwts-test/uefi-0001/test-0001.sh
> +++ b/fwts-test/uefi-0001/test-0001.sh
> @@ -4,6 +4,12 @@ TEST="Test table against UEFI"
>   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 --git a/fwts-test/uefi-0001/test-0002.sh b/fwts-test/uefi-0001/test-0002.sh
> index 3e91cc2..07c6bbb 100755
> --- a/fwts-test/uefi-0001/test-0002.sh
> +++ b/fwts-test/uefi-0001/test-0002.sh
> @@ -4,6 +4,12 @@ TEST="Test table against invalid UEFI"
>   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 --git a/fwts-test/waet-0001/test-0001.sh b/fwts-test/waet-0001/test-0001.sh
> index 31271a2..798b822 100755
> --- a/fwts-test/waet-0001/test-0001.sh
> +++ b/fwts-test/waet-0001/test-0001.sh
> @@ -4,6 +4,12 @@ TEST="Test table against WAET"
>   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 --git a/fwts-test/waet-0001/test-0002.sh b/fwts-test/waet-0001/test-0002.sh
> index 9bdf5ae..bf5d261 100755
> --- a/fwts-test/waet-0001/test-0002.sh
> +++ b/fwts-test/waet-0001/test-0002.sh
> @@ -4,6 +4,12 @@ TEST="Test table against invalid WAET"
>   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 --git a/fwts-test/waet-0001/test-0003.sh b/fwts-test/waet-0001/test-0003.sh
> index 1767240..c677761 100755
> --- a/fwts-test/waet-0001/test-0003.sh
> +++ b/fwts-test/waet-0001/test-0003.sh
> @@ -4,6 +4,12 @@ TEST="Test table against invalid WAET"
>   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 --git a/fwts-test/wdat-0001/test-0001.sh b/fwts-test/wdat-0001/test-0001.sh
> index 587a3b7..baa9c86 100755
> --- a/fwts-test/wdat-0001/test-0001.sh
> +++ b/fwts-test/wdat-0001/test-0001.sh
> @@ -4,6 +4,12 @@ TEST="Test apci table against WDAT"
>   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 --git a/fwts-test/wdat-0001/test-0002.sh b/fwts-test/wdat-0001/test-0002.sh
> index 17a279f..bb7f38a 100755
> --- a/fwts-test/wdat-0001/test-0002.sh
> +++ b/fwts-test/wdat-0001/test-0002.sh
> @@ -4,6 +4,12 @@ TEST="Test apci against invalid WDAT"
>   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 --git a/fwts-test/xenv-0001/test-0001.sh b/fwts-test/xenv-0001/test-0001.sh
> index cc4e935..9942c87 100755
> --- a/fwts-test/xenv-0001/test-0001.sh
> +++ b/fwts-test/xenv-0001/test-0001.sh
> @@ -4,6 +4,13 @@ TEST="Test table against XENV"
>   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 --git a/fwts-test/xenv-0001/test-0002.sh b/fwts-test/xenv-0001/test-0002.sh
> index ef6b858..fb5efce 100755
> --- a/fwts-test/xenv-0001/test-0002.sh
> +++ b/fwts-test/xenv-0001/test-0002.sh
> @@ -4,6 +4,12 @@ TEST="Test table against invalid XENV"
>   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 --git a/fwts-test/xsdt-0001/test-0001.sh b/fwts-test/xsdt-0001/test-0001.sh
> index 9104de5..4c9ae24 100755
> --- a/fwts-test/xsdt-0001/test-0001.sh
> +++ b/fwts-test/xsdt-0001/test-0001.sh
> @@ -4,6 +4,12 @@ TEST="Test apcitables against broken ACPI XSDT table"
>   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=$?
>

Acked-by: Ivan Hu <ivan.hu at canonical.com>



More information about the fwts-devel mailing list