diff mbox

[3/4] Add s390x build support, don't build UEFI specific code for this arch

Message ID 1456486933-5516-4-git-send-email-colin.king@canonical.com
State Accepted
Headers show

Commit Message

Colin Ian King Feb. 26, 2016, 11:42 a.m. UTC 
From: Colin Ian King <colin.king@canonical.com>

UEFI is not applicable on this architecture, so don't build the UEFI
specific tests

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 src/uefi/esrtdump/esrtdump.c             | 6 +++++-
 src/uefi/securebootcert/securebootcert.c | 7 ++++++-
 src/uefi/uefibootpath/uefibootpath.c     | 6 +++++-
 src/uefi/uefidump/uefidump.c             | 7 ++++++-
 src/uefi/uefirtauthvar/uefirtauthvar.c   | 6 +++++-
 src/uefi/uefirtmisc/uefirtmisc.c         | 6 +++++-
 src/uefi/uefirttime/uefirttime.c         | 6 +++++-
 src/uefi/uefirtvariable/uefirtvariable.c | 6 +++++-
 src/uefi/uefivarinfo/uefivarinfo.c       | 6 +++++-
 9 files changed, 47 insertions(+), 9 deletions(-)

Comments

Alex Hung March 2, 2016, 3:05 a.m. UTC | #1 
On 2016-02-26 07:42 PM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> UEFI is not applicable on this architecture, so don't build the UEFI
> specific tests
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>   src/uefi/esrtdump/esrtdump.c             | 6 +++++-
>   src/uefi/securebootcert/securebootcert.c | 7 ++++++-
>   src/uefi/uefibootpath/uefibootpath.c     | 6 +++++-
>   src/uefi/uefidump/uefidump.c             | 7 ++++++-
>   src/uefi/uefirtauthvar/uefirtauthvar.c   | 6 +++++-
>   src/uefi/uefirtmisc/uefirtmisc.c         | 6 +++++-
>   src/uefi/uefirttime/uefirttime.c         | 6 +++++-
>   src/uefi/uefirtvariable/uefirtvariable.c | 6 +++++-
>   src/uefi/uefivarinfo/uefivarinfo.c       | 6 +++++-
>   9 files changed, 47 insertions(+), 9 deletions(-)
>
> diff --git a/src/uefi/esrtdump/esrtdump.c b/src/uefi/esrtdump/esrtdump.c
> index c42e6a1..db8a39f 100644
> --- a/src/uefi/esrtdump/esrtdump.c
> +++ b/src/uefi/esrtdump/esrtdump.c
> @@ -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 <sys/types.h>
>   #include <dirent.h>
>
> -#include "fwts.h"
>   #include "fwts_uefi.h"
>
>   #define FWTS_ESRT_DIR_PATH		"/sys/firmware/efi/esrt/entries"
> @@ -205,3 +207,5 @@ static fwts_framework_ops esrtdump_ops = {
>   };
>
>   FWTS_REGISTER("esrtdump", &esrtdump_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UTILS | FWTS_FLAG_ROOT_PRIV)
> +
> +#endif
> diff --git a/src/uefi/securebootcert/securebootcert.c b/src/uefi/securebootcert/securebootcert.c
> index d7aa6c3..730898f 100644
> --- a/src/uefi/securebootcert/securebootcert.c
> +++ b/src/uefi/securebootcert/securebootcert.c
> @@ -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 <stddef.h>
>   #include <inttypes.h>
>
> -#include "fwts.h"
>   #include "fwts_uefi.h"
>   #include "sbkeydefs.h"
>
> @@ -400,3 +403,5 @@ static fwts_framework_ops securebootcert_ops = {
>   };
>
>   FWTS_REGISTER("securebootcert", &securebootcert_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV)
> +
> +#endif
> diff --git a/src/uefi/uefibootpath/uefibootpath.c b/src/uefi/uefibootpath/uefibootpath.c
> index 05ac35a..33db051 100644
> --- a/src/uefi/uefibootpath/uefibootpath.c
> +++ b/src/uefi/uefibootpath/uefibootpath.c
> @@ -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 <inttypes.h>
>   #include <stddef.h>
>   #include <ctype.h>
>
> -#include "fwts.h"
>   #include "fwts_uefi.h"
>
>   static int errors;
> @@ -888,3 +890,5 @@ static fwts_framework_ops uefibootpath_ops = {
>   };
>
>   FWTS_REGISTER("uefibootpath", &uefibootpath_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
> +
> +#endif
> diff --git a/src/uefi/uefidump/uefidump.c b/src/uefi/uefidump/uefidump.c
> index db55e62..d7eea4a 100644
> --- a/src/uefi/uefidump/uefidump.c
> +++ b/src/uefi/uefidump/uefidump.c
> @@ -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 <stddef.h>
>   #include <inttypes.h>
>   #include <ctype.h>
>
> -#include "fwts.h"
>   #include "fwts_uefi.h"
>
>
> @@ -1500,3 +1503,5 @@ static fwts_framework_ops uefidump_ops = {
>   };
>
>   FWTS_REGISTER("uefidump", &uefidump_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UTILS | FWTS_FLAG_ROOT_PRIV)
> +
> +#endif
> diff --git a/src/uefi/uefirtauthvar/uefirtauthvar.c b/src/uefi/uefirtauthvar/uefirtauthvar.c
> index 7ed703f..22322d0 100644
> --- a/src/uefi/uefirtauthvar/uefirtauthvar.c
> +++ b/src/uefi/uefirtauthvar/uefirtauthvar.c
> @@ -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 <inttypes.h>
>   #include <stdio.h>
> @@ -23,7 +26,6 @@
>   #include <sys/ioctl.h>
>   #include <fcntl.h>
>
> -#include "fwts.h"
>   #include "fwts_uefi.h"
>   #include "efi_runtime.h"
>   #include "fwts_efi_module.h"
> @@ -836,3 +838,5 @@ static fwts_framework_ops uefirtauthvar_ops = {
>   };
>
>   FWTS_REGISTER("uefirtauthvar", &uefirtauthvar_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV)
> +
> +#endif
> diff --git a/src/uefi/uefirtmisc/uefirtmisc.c b/src/uefi/uefirtmisc/uefirtmisc.c
> index 3787628..0b319d7 100644
> --- a/src/uefi/uefirtmisc/uefirtmisc.c
> +++ b/src/uefi/uefirtmisc/uefirtmisc.c
> @@ -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 <inttypes.h>
>   #include <stdio.h>
> @@ -23,7 +26,6 @@
>   #include <sys/ioctl.h>
>   #include <fcntl.h>
>
> -#include "fwts.h"
>   #include "fwts_uefi.h"
>   #include "efi_runtime.h"
>   #include "fwts_efi_module.h"
> @@ -253,3 +255,5 @@ static fwts_framework_ops uefirtmisc_ops = {
>   };
>
>   FWTS_REGISTER("uefirtmisc", &uefirtmisc_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV)
> +
> +#endif
> diff --git a/src/uefi/uefirttime/uefirttime.c b/src/uefi/uefirttime/uefirttime.c
> index b88c277..5c883a5 100644
> --- a/src/uefi/uefirttime/uefirttime.c
> +++ b/src/uefi/uefirttime/uefirttime.c
> @@ -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 <inttypes.h>
>   #include <stdio.h>
> @@ -23,7 +26,6 @@
>   #include <sys/ioctl.h>
>   #include <fcntl.h>
>
> -#include "fwts.h"
>   #include "fwts_uefi.h"
>   #include "efi_runtime.h"
>   #include "fwts_efi_module.h"
> @@ -1130,3 +1132,5 @@ static fwts_framework_ops uefirttime_ops = {
>   };
>
>   FWTS_REGISTER("uefirttime", &uefirttime_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV)
> +
> +#endif
> diff --git a/src/uefi/uefirtvariable/uefirtvariable.c b/src/uefi/uefirtvariable/uefirtvariable.c
> index a135ea5..a88b790 100644
> --- a/src/uefi/uefirtvariable/uefirtvariable.c
> +++ b/src/uefi/uefirtvariable/uefirtvariable.c
> @@ -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 <inttypes.h>
>   #include <stdio.h>
> @@ -23,7 +26,6 @@
>   #include <sys/ioctl.h>
>   #include <fcntl.h>
>
> -#include "fwts.h"
>   #include "fwts_uefi.h"
>   #include "efi_runtime.h"
>   #include "fwts_efi_module.h"
> @@ -1976,3 +1978,5 @@ static fwts_framework_ops uefirtvariable_ops = {
>   };
>
>   FWTS_REGISTER("uefirtvariable", &uefirtvariable_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV)
> +
> +#endif
> diff --git a/src/uefi/uefivarinfo/uefivarinfo.c b/src/uefi/uefivarinfo/uefivarinfo.c
> index 4ee469d..1ae97b0 100644
> --- a/src/uefi/uefivarinfo/uefivarinfo.c
> +++ b/src/uefi/uefivarinfo/uefivarinfo.c
> @@ -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 <inttypes.h>
>   #include <stdio.h>
> @@ -23,7 +26,6 @@
>   #include <sys/ioctl.h>
>   #include <fcntl.h>
>
> -#include "fwts.h"
>   #include "fwts_uefi.h"
>   #include "efi_runtime.h"
>   #include "fwts_efi_module.h"
> @@ -247,3 +249,5 @@ static fwts_framework_ops uefivarinfo_ops = {
>   };
>
>   FWTS_REGISTER("uefivarinfo", &uefivarinfo_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UTILS | FWTS_FLAG_ROOT_PRIV)
> +
> +#endif
>


Acked-by: Alex Hung <alex.hung@canonical.com>
Ivan Hu March 3, 2016, 9:24 a.m. UTC | #2 
On 2016年02月26日 19:42, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> UEFI is not applicable on this architecture, so don't build the UEFI
> specific tests
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>   src/uefi/esrtdump/esrtdump.c             | 6 +++++-
>   src/uefi/securebootcert/securebootcert.c | 7 ++++++-
>   src/uefi/uefibootpath/uefibootpath.c     | 6 +++++-
>   src/uefi/uefidump/uefidump.c             | 7 ++++++-
>   src/uefi/uefirtauthvar/uefirtauthvar.c   | 6 +++++-
>   src/uefi/uefirtmisc/uefirtmisc.c         | 6 +++++-
>   src/uefi/uefirttime/uefirttime.c         | 6 +++++-
>   src/uefi/uefirtvariable/uefirtvariable.c | 6 +++++-
>   src/uefi/uefivarinfo/uefivarinfo.c       | 6 +++++-
>   9 files changed, 47 insertions(+), 9 deletions(-)
>
> diff --git a/src/uefi/esrtdump/esrtdump.c b/src/uefi/esrtdump/esrtdump.c
> index c42e6a1..db8a39f 100644
> --- a/src/uefi/esrtdump/esrtdump.c
> +++ b/src/uefi/esrtdump/esrtdump.c
> @@ -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 <sys/types.h>
>   #include <dirent.h>
>
> -#include "fwts.h"
>   #include "fwts_uefi.h"
>
>   #define FWTS_ESRT_DIR_PATH		"/sys/firmware/efi/esrt/entries"
> @@ -205,3 +207,5 @@ static fwts_framework_ops esrtdump_ops = {
>   };
>
>   FWTS_REGISTER("esrtdump", &esrtdump_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UTILS | FWTS_FLAG_ROOT_PRIV)
> +
> +#endif
> diff --git a/src/uefi/securebootcert/securebootcert.c b/src/uefi/securebootcert/securebootcert.c
> index d7aa6c3..730898f 100644
> --- a/src/uefi/securebootcert/securebootcert.c
> +++ b/src/uefi/securebootcert/securebootcert.c
> @@ -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 <stddef.h>
>   #include <inttypes.h>
>
> -#include "fwts.h"
>   #include "fwts_uefi.h"
>   #include "sbkeydefs.h"
>
> @@ -400,3 +403,5 @@ static fwts_framework_ops securebootcert_ops = {
>   };
>
>   FWTS_REGISTER("securebootcert", &securebootcert_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV)
> +
> +#endif
> diff --git a/src/uefi/uefibootpath/uefibootpath.c b/src/uefi/uefibootpath/uefibootpath.c
> index 05ac35a..33db051 100644
> --- a/src/uefi/uefibootpath/uefibootpath.c
> +++ b/src/uefi/uefibootpath/uefibootpath.c
> @@ -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 <inttypes.h>
>   #include <stddef.h>
>   #include <ctype.h>
>
> -#include "fwts.h"
>   #include "fwts_uefi.h"
>
>   static int errors;
> @@ -888,3 +890,5 @@ static fwts_framework_ops uefibootpath_ops = {
>   };
>
>   FWTS_REGISTER("uefibootpath", &uefibootpath_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
> +
> +#endif
> diff --git a/src/uefi/uefidump/uefidump.c b/src/uefi/uefidump/uefidump.c
> index db55e62..d7eea4a 100644
> --- a/src/uefi/uefidump/uefidump.c
> +++ b/src/uefi/uefidump/uefidump.c
> @@ -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 <stddef.h>
>   #include <inttypes.h>
>   #include <ctype.h>
>
> -#include "fwts.h"
>   #include "fwts_uefi.h"
>
>
> @@ -1500,3 +1503,5 @@ static fwts_framework_ops uefidump_ops = {
>   };
>
>   FWTS_REGISTER("uefidump", &uefidump_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UTILS | FWTS_FLAG_ROOT_PRIV)
> +
> +#endif
> diff --git a/src/uefi/uefirtauthvar/uefirtauthvar.c b/src/uefi/uefirtauthvar/uefirtauthvar.c
> index 7ed703f..22322d0 100644
> --- a/src/uefi/uefirtauthvar/uefirtauthvar.c
> +++ b/src/uefi/uefirtauthvar/uefirtauthvar.c
> @@ -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 <inttypes.h>
>   #include <stdio.h>
> @@ -23,7 +26,6 @@
>   #include <sys/ioctl.h>
>   #include <fcntl.h>
>
> -#include "fwts.h"
>   #include "fwts_uefi.h"
>   #include "efi_runtime.h"
>   #include "fwts_efi_module.h"
> @@ -836,3 +838,5 @@ static fwts_framework_ops uefirtauthvar_ops = {
>   };
>
>   FWTS_REGISTER("uefirtauthvar", &uefirtauthvar_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV)
> +
> +#endif
> diff --git a/src/uefi/uefirtmisc/uefirtmisc.c b/src/uefi/uefirtmisc/uefirtmisc.c
> index 3787628..0b319d7 100644
> --- a/src/uefi/uefirtmisc/uefirtmisc.c
> +++ b/src/uefi/uefirtmisc/uefirtmisc.c
> @@ -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 <inttypes.h>
>   #include <stdio.h>
> @@ -23,7 +26,6 @@
>   #include <sys/ioctl.h>
>   #include <fcntl.h>
>
> -#include "fwts.h"
>   #include "fwts_uefi.h"
>   #include "efi_runtime.h"
>   #include "fwts_efi_module.h"
> @@ -253,3 +255,5 @@ static fwts_framework_ops uefirtmisc_ops = {
>   };
>
>   FWTS_REGISTER("uefirtmisc", &uefirtmisc_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV)
> +
> +#endif
> diff --git a/src/uefi/uefirttime/uefirttime.c b/src/uefi/uefirttime/uefirttime.c
> index b88c277..5c883a5 100644
> --- a/src/uefi/uefirttime/uefirttime.c
> +++ b/src/uefi/uefirttime/uefirttime.c
> @@ -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 <inttypes.h>
>   #include <stdio.h>
> @@ -23,7 +26,6 @@
>   #include <sys/ioctl.h>
>   #include <fcntl.h>
>
> -#include "fwts.h"
>   #include "fwts_uefi.h"
>   #include "efi_runtime.h"
>   #include "fwts_efi_module.h"
> @@ -1130,3 +1132,5 @@ static fwts_framework_ops uefirttime_ops = {
>   };
>
>   FWTS_REGISTER("uefirttime", &uefirttime_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV)
> +
> +#endif
> diff --git a/src/uefi/uefirtvariable/uefirtvariable.c b/src/uefi/uefirtvariable/uefirtvariable.c
> index a135ea5..a88b790 100644
> --- a/src/uefi/uefirtvariable/uefirtvariable.c
> +++ b/src/uefi/uefirtvariable/uefirtvariable.c
> @@ -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 <inttypes.h>
>   #include <stdio.h>
> @@ -23,7 +26,6 @@
>   #include <sys/ioctl.h>
>   #include <fcntl.h>
>
> -#include "fwts.h"
>   #include "fwts_uefi.h"
>   #include "efi_runtime.h"
>   #include "fwts_efi_module.h"
> @@ -1976,3 +1978,5 @@ static fwts_framework_ops uefirtvariable_ops = {
>   };
>
>   FWTS_REGISTER("uefirtvariable", &uefirtvariable_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV)
> +
> +#endif
> diff --git a/src/uefi/uefivarinfo/uefivarinfo.c b/src/uefi/uefivarinfo/uefivarinfo.c
> index 4ee469d..1ae97b0 100644
> --- a/src/uefi/uefivarinfo/uefivarinfo.c
> +++ b/src/uefi/uefivarinfo/uefivarinfo.c
> @@ -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 <inttypes.h>
>   #include <stdio.h>
> @@ -23,7 +26,6 @@
>   #include <sys/ioctl.h>
>   #include <fcntl.h>
>
> -#include "fwts.h"
>   #include "fwts_uefi.h"
>   #include "efi_runtime.h"
>   #include "fwts_efi_module.h"
> @@ -247,3 +249,5 @@ static fwts_framework_ops uefivarinfo_ops = {
>   };
>
>   FWTS_REGISTER("uefivarinfo", &uefivarinfo_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UTILS | FWTS_FLAG_ROOT_PRIV)
> +
> +#endif
>

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

Patch

diff --git a/src/uefi/esrtdump/esrtdump.c b/src/uefi/esrtdump/esrtdump.c
index c42e6a1..db8a39f 100644
--- a/src/uefi/esrtdump/esrtdump.c
+++ b/src/uefi/esrtdump/esrtdump.c
@@ -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 <sys/types.h>
 #include <dirent.h>
 
-#include "fwts.h"
 #include "fwts_uefi.h"
 
 #define FWTS_ESRT_DIR_PATH		"/sys/firmware/efi/esrt/entries"
@@ -205,3 +207,5 @@  static fwts_framework_ops esrtdump_ops = {
 };
 
 FWTS_REGISTER("esrtdump", &esrtdump_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UTILS | FWTS_FLAG_ROOT_PRIV)
+
+#endif
diff --git a/src/uefi/securebootcert/securebootcert.c b/src/uefi/securebootcert/securebootcert.c
index d7aa6c3..730898f 100644
--- a/src/uefi/securebootcert/securebootcert.c
+++ b/src/uefi/securebootcert/securebootcert.c
@@ -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 <stddef.h>
 #include <inttypes.h>
 
-#include "fwts.h"
 #include "fwts_uefi.h"
 #include "sbkeydefs.h"
 
@@ -400,3 +403,5 @@  static fwts_framework_ops securebootcert_ops = {
 };
 
 FWTS_REGISTER("securebootcert", &securebootcert_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV)
+
+#endif
diff --git a/src/uefi/uefibootpath/uefibootpath.c b/src/uefi/uefibootpath/uefibootpath.c
index 05ac35a..33db051 100644
--- a/src/uefi/uefibootpath/uefibootpath.c
+++ b/src/uefi/uefibootpath/uefibootpath.c
@@ -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 <inttypes.h>
 #include <stddef.h>
 #include <ctype.h>
 
-#include "fwts.h"
 #include "fwts_uefi.h"
 
 static int errors;
@@ -888,3 +890,5 @@  static fwts_framework_ops uefibootpath_ops = {
 };
 
 FWTS_REGISTER("uefibootpath", &uefibootpath_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
+
+#endif
diff --git a/src/uefi/uefidump/uefidump.c b/src/uefi/uefidump/uefidump.c
index db55e62..d7eea4a 100644
--- a/src/uefi/uefidump/uefidump.c
+++ b/src/uefi/uefidump/uefidump.c
@@ -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 <stddef.h>
 #include <inttypes.h>
 #include <ctype.h>
 
-#include "fwts.h"
 #include "fwts_uefi.h"
 
 
@@ -1500,3 +1503,5 @@  static fwts_framework_ops uefidump_ops = {
 };
 
 FWTS_REGISTER("uefidump", &uefidump_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UTILS | FWTS_FLAG_ROOT_PRIV)
+
+#endif
diff --git a/src/uefi/uefirtauthvar/uefirtauthvar.c b/src/uefi/uefirtauthvar/uefirtauthvar.c
index 7ed703f..22322d0 100644
--- a/src/uefi/uefirtauthvar/uefirtauthvar.c
+++ b/src/uefi/uefirtauthvar/uefirtauthvar.c
@@ -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 <inttypes.h>
 #include <stdio.h>
@@ -23,7 +26,6 @@ 
 #include <sys/ioctl.h>
 #include <fcntl.h>
 
-#include "fwts.h"
 #include "fwts_uefi.h"
 #include "efi_runtime.h"
 #include "fwts_efi_module.h"
@@ -836,3 +838,5 @@  static fwts_framework_ops uefirtauthvar_ops = {
 };
 
 FWTS_REGISTER("uefirtauthvar", &uefirtauthvar_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV)
+
+#endif
diff --git a/src/uefi/uefirtmisc/uefirtmisc.c b/src/uefi/uefirtmisc/uefirtmisc.c
index 3787628..0b319d7 100644
--- a/src/uefi/uefirtmisc/uefirtmisc.c
+++ b/src/uefi/uefirtmisc/uefirtmisc.c
@@ -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 <inttypes.h>
 #include <stdio.h>
@@ -23,7 +26,6 @@ 
 #include <sys/ioctl.h>
 #include <fcntl.h>
 
-#include "fwts.h"
 #include "fwts_uefi.h"
 #include "efi_runtime.h"
 #include "fwts_efi_module.h"
@@ -253,3 +255,5 @@  static fwts_framework_ops uefirtmisc_ops = {
 };
 
 FWTS_REGISTER("uefirtmisc", &uefirtmisc_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV)
+
+#endif
diff --git a/src/uefi/uefirttime/uefirttime.c b/src/uefi/uefirttime/uefirttime.c
index b88c277..5c883a5 100644
--- a/src/uefi/uefirttime/uefirttime.c
+++ b/src/uefi/uefirttime/uefirttime.c
@@ -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 <inttypes.h>
 #include <stdio.h>
@@ -23,7 +26,6 @@ 
 #include <sys/ioctl.h>
 #include <fcntl.h>
 
-#include "fwts.h"
 #include "fwts_uefi.h"
 #include "efi_runtime.h"
 #include "fwts_efi_module.h"
@@ -1130,3 +1132,5 @@  static fwts_framework_ops uefirttime_ops = {
 };
 
 FWTS_REGISTER("uefirttime", &uefirttime_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV)
+
+#endif
diff --git a/src/uefi/uefirtvariable/uefirtvariable.c b/src/uefi/uefirtvariable/uefirtvariable.c
index a135ea5..a88b790 100644
--- a/src/uefi/uefirtvariable/uefirtvariable.c
+++ b/src/uefi/uefirtvariable/uefirtvariable.c
@@ -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 <inttypes.h>
 #include <stdio.h>
@@ -23,7 +26,6 @@ 
 #include <sys/ioctl.h>
 #include <fcntl.h>
 
-#include "fwts.h"
 #include "fwts_uefi.h"
 #include "efi_runtime.h"
 #include "fwts_efi_module.h"
@@ -1976,3 +1978,5 @@  static fwts_framework_ops uefirtvariable_ops = {
 };
 
 FWTS_REGISTER("uefirtvariable", &uefirtvariable_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV)
+
+#endif
diff --git a/src/uefi/uefivarinfo/uefivarinfo.c b/src/uefi/uefivarinfo/uefivarinfo.c
index 4ee469d..1ae97b0 100644
--- a/src/uefi/uefivarinfo/uefivarinfo.c
+++ b/src/uefi/uefivarinfo/uefivarinfo.c
@@ -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 <inttypes.h>
 #include <stdio.h>
@@ -23,7 +26,6 @@ 
 #include <sys/ioctl.h>
 #include <fcntl.h>
 
-#include "fwts.h"
 #include "fwts_uefi.h"
 #include "efi_runtime.h"
 #include "fwts_efi_module.h"
@@ -247,3 +249,5 @@  static fwts_framework_ops uefivarinfo_ops = {
 };
 
 FWTS_REGISTER("uefivarinfo", &uefivarinfo_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UTILS | FWTS_FLAG_ROOT_PRIV)
+
+#endif