| Message ID | 1375343160-5228-1-git-send-email-ivan.hu@canonical.com |
|---|---|
| State | Rejected |
| Headers | show |
On 01/08/13 08:46, Ivan Hu wrote: > Moving the uefirtvariable, uefirttime and uefirtmisc UEFI runtime service > tests in the the UEFI category instead of using unsafe category in order > to make it more specific and let users to be more aware of the tests. > > Signed-off-by: Ivan Hu <ivan.hu@canonical.com> > --- > src/lib/src/fwts_framework.c | 8 +++++++- > src/uefi/uefirtmisc/uefirtmisc.c | 2 +- > src/uefi/uefirttime/uefirttime.c | 2 +- > src/uefi/uefirtvariable/uefirtvariable.c | 2 +- > 4 files changed, 10 insertions(+), 4 deletions(-) > > diff --git a/src/lib/src/fwts_framework.c b/src/lib/src/fwts_framework.c > index 1581681..d985700 100644 > --- a/src/lib/src/fwts_framework.c > +++ b/src/lib/src/fwts_framework.c > @@ -38,7 +38,8 @@ > FWTS_FLAG_INTERACTIVE_EXPERIMENTAL | \ > FWTS_FLAG_POWER_STATES | \ > FWTS_FLAG_UTILS | \ > - FWTS_FLAG_UNSAFE) > + FWTS_FLAG_UNSAFE | \ > + FWTS_FLAG_TEST_UEFI) > > static fwts_list tests_to_skip; > > @@ -81,6 +82,7 @@ static fwts_option fwts_framework_options[] = { > { "filter-error-keep", "", 1, "Keep errors that match any of the specified labels." }, > { "acpica-debug", "", 0, "Enable ACPICA debug/warning messages." }, > { "acpica", "", 1, "Enable ACPICA run time options." }, > + { "uefi", "", 0, "Run UEFI tests." }, > { NULL, NULL, 0, NULL } > }; > > @@ -227,6 +229,7 @@ static void fwts_framework_show_tests(fwts_framework *fw, const bool full) > { "Power States", FWTS_FLAG_POWER_STATES }, > { "Utilities", FWTS_FLAG_UTILS }, > { "Unsafe", FWTS_FLAG_UNSAFE }, > + { "UEFI", FWTS_FLAG_TEST_UEFI }, > { NULL, 0 }, > }; > > @@ -1130,6 +1133,9 @@ int fwts_framework_options_handler(fwts_framework *fw, int argc, char * const ar > if (fwts_framework_acpica_parse(fw, optarg) != FWTS_OK) > return FWTS_ERROR; > break; > + case 38: /* --uefi */ > + fw->flags |= FWTS_FLAG_TEST_UEFI; > + break; > } > break; > case 'a': /* --all */ > diff --git a/src/uefi/uefirtmisc/uefirtmisc.c b/src/uefi/uefirtmisc/uefirtmisc.c > index 8fd4b4c..954e6d7 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_TEST_UEFI| FWTS_FLAG_ROOT_PRIV); > diff --git a/src/uefi/uefirttime/uefirttime.c b/src/uefi/uefirttime/uefirttime.c > index 2094677..9c4c5aa 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_TEST_UEFI | FWTS_FLAG_ROOT_PRIV); > diff --git a/src/uefi/uefirtvariable/uefirtvariable.c b/src/uefi/uefirtvariable/uefirtvariable.c > index e223f82..35bba1e 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_TEST_UEFI | FWTS_FLAG_ROOT_PRIV); > So are some of these tests still potentially "unsafe" (e.g. could brick or mess up UEFI vars?) If so, maybe logically or'ing FWTS_FLAG_UNSAFE in is still valid, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV Colin
diff --git a/src/lib/src/fwts_framework.c b/src/lib/src/fwts_framework.c index 1581681..d985700 100644 --- a/src/lib/src/fwts_framework.c +++ b/src/lib/src/fwts_framework.c @@ -38,7 +38,8 @@ FWTS_FLAG_INTERACTIVE_EXPERIMENTAL | \ FWTS_FLAG_POWER_STATES | \ FWTS_FLAG_UTILS | \ - FWTS_FLAG_UNSAFE) + FWTS_FLAG_UNSAFE | \ + FWTS_FLAG_TEST_UEFI) static fwts_list tests_to_skip; @@ -81,6 +82,7 @@ static fwts_option fwts_framework_options[] = { { "filter-error-keep", "", 1, "Keep errors that match any of the specified labels." }, { "acpica-debug", "", 0, "Enable ACPICA debug/warning messages." }, { "acpica", "", 1, "Enable ACPICA run time options." }, + { "uefi", "", 0, "Run UEFI tests." }, { NULL, NULL, 0, NULL } }; @@ -227,6 +229,7 @@ static void fwts_framework_show_tests(fwts_framework *fw, const bool full) { "Power States", FWTS_FLAG_POWER_STATES }, { "Utilities", FWTS_FLAG_UTILS }, { "Unsafe", FWTS_FLAG_UNSAFE }, + { "UEFI", FWTS_FLAG_TEST_UEFI }, { NULL, 0 }, }; @@ -1130,6 +1133,9 @@ int fwts_framework_options_handler(fwts_framework *fw, int argc, char * const ar if (fwts_framework_acpica_parse(fw, optarg) != FWTS_OK) return FWTS_ERROR; break; + case 38: /* --uefi */ + fw->flags |= FWTS_FLAG_TEST_UEFI; + break; } break; case 'a': /* --all */ diff --git a/src/uefi/uefirtmisc/uefirtmisc.c b/src/uefi/uefirtmisc/uefirtmisc.c index 8fd4b4c..954e6d7 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_TEST_UEFI| FWTS_FLAG_ROOT_PRIV); diff --git a/src/uefi/uefirttime/uefirttime.c b/src/uefi/uefirttime/uefirttime.c index 2094677..9c4c5aa 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_TEST_UEFI | FWTS_FLAG_ROOT_PRIV); diff --git a/src/uefi/uefirtvariable/uefirtvariable.c b/src/uefi/uefirtvariable/uefirtvariable.c index e223f82..35bba1e 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_TEST_UEFI | FWTS_FLAG_ROOT_PRIV);
Moving the uefirtvariable, uefirttime and uefirtmisc UEFI runtime service tests in the the UEFI category instead of using unsafe category in order to make it more specific and let users to be more aware of the tests. Signed-off-by: Ivan Hu <ivan.hu@canonical.com> --- src/lib/src/fwts_framework.c | 8 +++++++- src/uefi/uefirtmisc/uefirtmisc.c | 2 +- src/uefi/uefirttime/uefirttime.c | 2 +- src/uefi/uefirtvariable/uefirtvariable.c | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-)