diff mbox

fwts-test: disable some acpi specific x86 tests for non-x86 systems

Message ID 20170523143018.17134-1-colin.king@canonical.com
State Accepted
Headers show

Commit Message

Colin Ian King May 23, 2017, 2:30 p.m. UTC
From: Colin Ian King <colin.king@canonical.com>

Due to the way ACPI tables can be faked when loading them in from file
we're getting some memory address differences on x86 compared to other
architectures. For the moment, let's disable these tests and I'll try
and figure out a better way to test these that don't need to concern
the different addressing layouts.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 fwts-test/arg-table-path-0001/test-0001.sh | 10 ++++++++++
 fwts-test/arg-table-path-0001/test-0002.sh | 10 ++++++++++
 fwts-test/rsdp-0001/test-0001.sh           |  2 +-
 3 files changed, 21 insertions(+), 1 deletion(-)

Comments

Alex Hung May 23, 2017, 5:57 p.m. UTC | #1
On 2017-05-23 07:30 AM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> Due to the way ACPI tables can be faked when loading them in from file
> we're getting some memory address differences on x86 compared to other
> architectures. For the moment, let's disable these tests and I'll try
> and figure out a better way to test these that don't need to concern
> the different addressing layouts.
> 
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>   fwts-test/arg-table-path-0001/test-0001.sh | 10 ++++++++++
>   fwts-test/arg-table-path-0001/test-0002.sh | 10 ++++++++++
>   fwts-test/rsdp-0001/test-0001.sh           |  2 +-
>   3 files changed, 21 insertions(+), 1 deletion(-)
> 
> diff --git a/fwts-test/arg-table-path-0001/test-0001.sh b/fwts-test/arg-table-path-0001/test-0001.sh
> index b2006f98..804a2962 100755
> --- a/fwts-test/arg-table-path-0001/test-0001.sh
> +++ b/fwts-test/arg-table-path-0001/test-0001.sh
> @@ -11,6 +11,16 @@ if [ $? -eq 1 ]; then
>   	exit 77
>   fi
>   
> +machine=$(uname -m)
> +case $machine in
> +x86 | x86_32 | x86_64 | i686 )
> +	;;
> +*)
> +        echo SKIP: $TEST, $NAME
> +        exit 77
> +	;;
> +esac
> +
>   #
>   # 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 0ae6ddf2..15676219 100755
> --- a/fwts-test/arg-table-path-0001/test-0002.sh
> +++ b/fwts-test/arg-table-path-0001/test-0002.sh
> @@ -11,6 +11,16 @@ if [ $? -eq 1 ]; then
>   	exit 77
>   fi
>   
> +machine=$(uname -m)
> +case $machine in
> +x86 | x86_32 | x86_64 | i686 )
> +	;;
> +*)
> +        echo SKIP: $TEST, $NAME
> +        exit 77
> +	;;
> +esac
> +
>   #
>   # 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/rsdp-0001/test-0001.sh b/fwts-test/rsdp-0001/test-0001.sh
> index 1adaccf7..7eb0600c 100755
> --- a/fwts-test/rsdp-0001/test-0001.sh
> +++ b/fwts-test/rsdp-0001/test-0001.sh
> @@ -6,7 +6,7 @@ TMPLOG=$TMP/rsdp.log.$$
>   
>   machine=$(uname -m)
>   case $machine in
> -x86 | x86_32 | x86_64 | i686 | arm64 | aarch64)
> +x86 | x86_32 | x86_64 | i686 )
>   	;;
>   *)
>           echo SKIP: $TEST, $NAME
> 
Acked-by: Alex Hung <alex.hung@canonical.com>
Ivan Hu May 24, 2017, 2:15 a.m. UTC | #2
On 05/23/2017 10:30 PM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> Due to the way ACPI tables can be faked when loading them in from file
> we're getting some memory address differences on x86 compared to other
> architectures. For the moment, let's disable these tests and I'll try
> and figure out a better way to test these that don't need to concern
> the different addressing layouts.
> 
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>   fwts-test/arg-table-path-0001/test-0001.sh | 10 ++++++++++
>   fwts-test/arg-table-path-0001/test-0002.sh | 10 ++++++++++
>   fwts-test/rsdp-0001/test-0001.sh           |  2 +-
>   3 files changed, 21 insertions(+), 1 deletion(-)
> 
> diff --git a/fwts-test/arg-table-path-0001/test-0001.sh b/fwts-test/arg-table-path-0001/test-0001.sh
> index b2006f98..804a2962 100755
> --- a/fwts-test/arg-table-path-0001/test-0001.sh
> +++ b/fwts-test/arg-table-path-0001/test-0001.sh
> @@ -11,6 +11,16 @@ if [ $? -eq 1 ]; then
>   	exit 77
>   fi
>   
> +machine=$(uname -m)
> +case $machine in
> +x86 | x86_32 | x86_64 | i686 )
> +	;;
> +*)
> +        echo SKIP: $TEST, $NAME
> +        exit 77
> +	;;
> +esac
> +
>   #
>   # 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 0ae6ddf2..15676219 100755
> --- a/fwts-test/arg-table-path-0001/test-0002.sh
> +++ b/fwts-test/arg-table-path-0001/test-0002.sh
> @@ -11,6 +11,16 @@ if [ $? -eq 1 ]; then
>   	exit 77
>   fi
>   
> +machine=$(uname -m)
> +case $machine in
> +x86 | x86_32 | x86_64 | i686 )
> +	;;
> +*)
> +        echo SKIP: $TEST, $NAME
> +        exit 77
> +	;;
> +esac
> +
>   #
>   # 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/rsdp-0001/test-0001.sh b/fwts-test/rsdp-0001/test-0001.sh
> index 1adaccf7..7eb0600c 100755
> --- a/fwts-test/rsdp-0001/test-0001.sh
> +++ b/fwts-test/rsdp-0001/test-0001.sh
> @@ -6,7 +6,7 @@ TMPLOG=$TMP/rsdp.log.$$
>   
>   machine=$(uname -m)
>   case $machine in
> -x86 | x86_32 | x86_64 | i686 | arm64 | aarch64)
> +x86 | x86_32 | x86_64 | i686 )
>   	;;
>   *)
>           echo SKIP: $TEST, $NAME
> 

Acked-by: Ivan Hu <ivan.hu@canonical.com>
diff mbox

Patch

diff --git a/fwts-test/arg-table-path-0001/test-0001.sh b/fwts-test/arg-table-path-0001/test-0001.sh
index b2006f98..804a2962 100755
--- a/fwts-test/arg-table-path-0001/test-0001.sh
+++ b/fwts-test/arg-table-path-0001/test-0001.sh
@@ -11,6 +11,16 @@  if [ $? -eq 1 ]; then
 	exit 77
 fi
 
+machine=$(uname -m)
+case $machine in
+x86 | x86_32 | x86_64 | i686 )
+	;;
+*)
+        echo SKIP: $TEST, $NAME
+        exit 77
+	;;
+esac
+
 #
 # 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 0ae6ddf2..15676219 100755
--- a/fwts-test/arg-table-path-0001/test-0002.sh
+++ b/fwts-test/arg-table-path-0001/test-0002.sh
@@ -11,6 +11,16 @@  if [ $? -eq 1 ]; then
 	exit 77
 fi
 
+machine=$(uname -m)
+case $machine in
+x86 | x86_32 | x86_64 | i686 )
+	;;
+*)
+        echo SKIP: $TEST, $NAME
+        exit 77
+	;;
+esac
+
 #
 # 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/rsdp-0001/test-0001.sh b/fwts-test/rsdp-0001/test-0001.sh
index 1adaccf7..7eb0600c 100755
--- a/fwts-test/rsdp-0001/test-0001.sh
+++ b/fwts-test/rsdp-0001/test-0001.sh
@@ -6,7 +6,7 @@  TMPLOG=$TMP/rsdp.log.$$
 
 machine=$(uname -m)
 case $machine in
-x86 | x86_32 | x86_64 | i686 | arm64 | aarch64)
+x86 | x86_32 | x86_64 | i686 )
 	;;
 *)
         echo SKIP: $TEST, $NAME