From patchwork Thu Aug 1 06:02:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Hu X-Patchwork-Id: 263923 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 356482C00AA for ; Thu, 1 Aug 2013 16:03:10 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1V4lye-0001Ji-MC; Thu, 01 Aug 2013 06:03:08 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1V4lxx-00017O-6n for fwts-devel@lists.ubuntu.com; Thu, 01 Aug 2013 06:02:25 +0000 Received: from [175.180.135.244] (helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1V4lxw-0007kN-9l; Thu, 01 Aug 2013 06:02:25 +0000 From: Ivan Hu To: fwts-devel@lists.ubuntu.com Subject: [PATCH] UEFI: change the fwts_category Unsafe to UEFI (LP:#1207178) Date: Thu, 1 Aug 2013 14:02:17 +0800 Message-Id: <1375336937-20667-1-git-send-email-ivan.hu@canonical.com> X-Mailer: git-send-email 1.7.9.5 X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: fwts-devel-bounces@lists.ubuntu.com Sender: fwts-devel-bounces@lists.ubuntu.com Modify the fwts category from Unsafe to UEFI, also change FWTS_FLAG_UNSAFE to FWTS_FLAG_UEFI, in order to make the category more specific and let users to be more aware of the tests. Signed-off-by: Ivan Hu --- src/lib/include/fwts_framework.h | 2 +- src/lib/src/fwts_framework.c | 14 +++++++------- src/uefi/uefirtmisc/uefirtmisc.c | 2 +- src/uefi/uefirttime/uefirttime.c | 2 +- src/uefi/uefirtvariable/uefirtvariable.c | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/lib/include/fwts_framework.h b/src/lib/include/fwts_framework.h index f365d74..655f9fa 100644 --- a/src/lib/include/fwts_framework.h +++ b/src/lib/include/fwts_framework.h @@ -44,7 +44,7 @@ typedef enum { FWTS_FLAG_INTERACTIVE_EXPERIMENTAL = 0x00008000, FWTS_FLAG_POWER_STATES = 0x00010000, FWTS_FLAG_ROOT_PRIV = 0x00020000, - FWTS_FLAG_UNSAFE = 0x00040000, + FWTS_FLAG_UEFI = 0x00040000, FWTS_FLAG_TEST_BIOS = 0x01000000, FWTS_FLAG_TEST_UEFI = 0x02000000, FWTS_FLAG_TEST_ACPI = 0x04000000, diff --git a/src/lib/src/fwts_framework.c b/src/lib/src/fwts_framework.c index 1581681..3db5836 100644 --- a/src/lib/src/fwts_framework.c +++ b/src/lib/src/fwts_framework.c @@ -38,7 +38,7 @@ FWTS_FLAG_INTERACTIVE_EXPERIMENTAL | \ FWTS_FLAG_POWER_STATES | \ FWTS_FLAG_UTILS | \ - FWTS_FLAG_UNSAFE) + FWTS_FLAG_UEFI) static fwts_list tests_to_skip; @@ -76,7 +76,7 @@ static fwts_option fwts_framework_options[] = { { "lp-tags-log", "", 0, "Output LaunchPad bug tags in results log." }, { "disassemble-aml", "", 0, "Disassemble AML from DSDT and SSDT tables." }, { "log-type", "", 1, "Specify log type (plaintext, json, html or xml)." }, - { "unsafe", "U", 0, "Unsafe tests (tests that can potentially cause kernel oopses." }, + { "uefi", "U", 0, "Run UEFI tests." }, { "filter-error-discard", "", 1, "Discard errors that match any of the specified labels." }, { "filter-error-keep", "", 1, "Keep errors that match any of the specified labels." }, { "acpica-debug", "", 0, "Enable ACPICA debug/warning messages." }, @@ -226,7 +226,7 @@ static void fwts_framework_show_tests(fwts_framework *fw, const bool full) { "Interactive Experimental", FWTS_FLAG_INTERACTIVE_EXPERIMENTAL }, { "Power States", FWTS_FLAG_POWER_STATES }, { "Utilities", FWTS_FLAG_UTILS }, - { "Unsafe", FWTS_FLAG_UNSAFE }, + { "UEFI", FWTS_FLAG_UEFI }, { NULL, 0 }, }; @@ -1112,8 +1112,8 @@ int fwts_framework_options_handler(fwts_framework *fw, int argc, char * const ar if (fwts_framework_log_type_parse(fw, optarg) != FWTS_OK) return FWTS_ERROR; break; - case 33: /* --unsafe */ - fw->flags |= FWTS_FLAG_UNSAFE; + case 33: /* --uefi */ + fw->flags |= FWTS_FLAG_UEFI; break; case 34: /* --filter-error-discard */ if (fwts_framework_filter_error_parse(optarg, &fw->errors_filter_discard) != FWTS_OK) @@ -1197,8 +1197,8 @@ int fwts_framework_options_handler(fwts_framework *fw, int argc, char * const ar case 'u': /* --utils */ fw->flags |= FWTS_FLAG_UTILS; break; - case 'U': /* --unsafe */ - fw->flags |= FWTS_FLAG_UNSAFE; + case 'U': /* --uefi */ + fw->flags |= FWTS_FLAG_UEFI; break; case 'v': /* --version */ fwts_framework_show_version(stdout, argv[0]); diff --git a/src/uefi/uefirtmisc/uefirtmisc.c b/src/uefi/uefirtmisc/uefirtmisc.c index 8fd4b4c..ccb0516 100644 --- a/src/uefi/uefirtmisc/uefirtmisc.c +++ b/src/uefi/uefirtmisc/uefirtmisc.c @@ -224,4 +224,4 @@ static fwts_framework_ops uefirtmisc_ops = { .minor_tests = uefirtmisc_tests }; -FWTS_REGISTER("uefirtmisc", &uefirtmisc_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV); +FWTS_REGISTER("uefirtmisc", &uefirtmisc_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UEFI | FWTS_FLAG_ROOT_PRIV); diff --git a/src/uefi/uefirttime/uefirttime.c b/src/uefi/uefirttime/uefirttime.c index 2094677..7007263 100644 --- a/src/uefi/uefirttime/uefirttime.c +++ b/src/uefi/uefirttime/uefirttime.c @@ -497,4 +497,4 @@ static fwts_framework_ops uefirttime_ops = { .minor_tests = uefirttime_tests }; -FWTS_REGISTER("uefirttime", &uefirttime_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV); +FWTS_REGISTER("uefirttime", &uefirttime_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UEFI | FWTS_FLAG_ROOT_PRIV); diff --git a/src/uefi/uefirtvariable/uefirtvariable.c b/src/uefi/uefirtvariable/uefirtvariable.c index e223f82..49a8c1f 100644 --- a/src/uefi/uefirtvariable/uefirtvariable.c +++ b/src/uefi/uefirtvariable/uefirtvariable.c @@ -1654,4 +1654,4 @@ static fwts_framework_ops uefirtvariable_ops = { .options_check = options_check, }; -FWTS_REGISTER("uefirtvariable", &uefirtvariable_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV); +FWTS_REGISTER("uefirtvariable", &uefirtvariable_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UEFI | FWTS_FLAG_ROOT_PRIV);