[PATCH] lib + tests: don't stringify the test name in FWTS_REGISTER
Keng-Yu Lin
kengyu at canonical.com
Thu Jan 3 06:51:04 UTC 2013
On Mon, Dec 31, 2012 at 4:38 AM, Colin King <colin.king at canonical.com> wrote:
> From: Colin Ian King <colin.king at canonical.com>
>
> FWTS_REGISTER currently takes the test name and use this as the
> init function stub and also stringifies this to provide the
> literal string name of the test. This makes the macro a little
> confusing since test name should be passes as a literal string
> and we don't really need to add the name of test to the init
> function stub since these are static declarations.
>
> This patch removes the stringification and also modifies all
> the tests to now pass in a literal string.
>
> Signed-off-by: Colin Ian King <colin.king at canonical.com>
> ---
> src/acpi/ac_adapter/ac_adapter.c | 2 +-
> src/acpi/acpidump/acpidump.c | 2 +-
> src/acpi/acpiinfo/acpiinfo.c | 2 +-
> src/acpi/acpitables/acpitables.c | 2 +-
> src/acpi/apicinstance/apicinstance.c | 2 +-
> src/acpi/battery/battery.c | 2 +-
> src/acpi/brightness/brightness.c | 2 +-
> src/acpi/checksum/checksum.c | 2 +-
> src/acpi/cstates/cstates.c | 2 +-
> src/acpi/dmar/dmar.c | 2 +-
> src/acpi/fadt/fadt.c | 2 +-
> src/acpi/fan/fan.c | 2 +-
> src/acpi/klog/klog.c | 2 +-
> src/acpi/lid/lid.c | 2 +-
> src/acpi/mcfg/mcfg.c | 2 +-
> src/acpi/method/method.c | 2 +-
> src/acpi/osilinux/osilinux.c | 2 +-
> src/acpi/pcc/pcc.c | 2 +-
> src/acpi/powerbutton/powerbutton.c | 2 +-
> src/acpi/s3/s3.c | 2 +-
> src/acpi/s3power/s3power.c | 2 +-
> src/acpi/s4/s4.c | 2 +-
> src/acpi/syntaxcheck/syntaxcheck.c | 2 +-
> src/acpi/wakealarm/wakealarm.c | 2 +-
> src/acpi/wmi/wmi.c | 2 +-
> src/apic/apicedge/apicedge.c | 2 +-
> src/bios/bios32/bios32.c | 2 +-
> src/bios/bios_info/bios_info.c | 2 +-
> src/bios/ebda_region/ebda_region.c | 2 +-
> src/bios/ebdadump/ebdadump.c | 2 +-
> src/bios/hdaaudio/hdaaudio.c | 2 +-
> src/bios/memmapdump/memmapdump.c | 2 +-
> src/bios/mtrr/mtrr.c | 2 +-
> src/bios/multiproc/mpcheck.c | 2 +-
> src/bios/multiproc/mpdump.c | 2 +-
> src/bios/os2gap/os2gap.c | 2 +-
> src/bios/pciirq/pciirq.c | 2 +-
> src/bios/pnp/pnp.c | 2 +-
> src/bios/romdump/romdump.c | 2 +-
> src/bios/smbios/smbios.c | 2 +-
> src/cmos/cmosdump/cmosdump.c | 2 +-
> src/cpu/cpufreq/cpufreq.c | 2 +-
> src/cpu/maxfreq/maxfreq.c | 2 +-
> src/cpu/microcode/microcode.c | 2 +-
> src/cpu/msr/msr.c | 2 +-
> src/cpu/nx/nx.c | 2 +-
> src/cpu/virt/virt.c | 2 +-
> src/dmi/dmi_decode/dmi_decode.c | 2 +-
> src/example/blank/blank.c | 2 +-
> src/hotkey/hotkey/hotkey.c | 2 +-
> src/hpet/hpet_check/hpet_check.c | 2 +-
> src/kernel/oops/oops.c | 2 +-
> src/kernel/version/version.c | 2 +-
> src/lib/include/fwts_framework.h | 6 +++---
> src/pci/aspm/aspm.c | 2 +-
> src/pci/crs/crs.c | 2 +-
> src/pci/maxreadreq/maxreadreq.c | 2 +-
> src/uefi/csm/csm.c | 2 +-
> src/uefi/uefidump/uefidump.c | 2 +-
> src/uefi/uefirttime/uefirttime.c | 2 +-
> src/uefi/uefirtvariable/uefirtvariable.c | 2 +-
> 61 files changed, 63 insertions(+), 63 deletions(-)
>
> diff --git a/src/acpi/ac_adapter/ac_adapter.c b/src/acpi/ac_adapter/ac_adapter.c
> index 2bb3f1b..28d0461 100644
> --- a/src/acpi/ac_adapter/ac_adapter.c
> +++ b/src/acpi/ac_adapter/ac_adapter.c
> @@ -161,6 +161,6 @@ static fwts_framework_ops ac_adapter_ops = {
> .minor_tests = ac_adapter_tests
> };
>
> -FWTS_REGISTER(ac_adapter, &ac_adapter_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_INTERACTIVE);
> +FWTS_REGISTER("ac_adapter", &ac_adapter_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_INTERACTIVE);
>
> #endif
> diff --git a/src/acpi/acpidump/acpidump.c b/src/acpi/acpidump/acpidump.c
> index 1b96dd9..88dbc10 100644
> --- a/src/acpi/acpidump/acpidump.c
> +++ b/src/acpi/acpidump/acpidump.c
> @@ -1782,4 +1782,4 @@ static fwts_framework_ops acpidump_ops = {
> .minor_tests = acpidump_tests
> };
>
> -FWTS_REGISTER(acpidump, &acpidump_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UTILS);
> +FWTS_REGISTER("acpidump", &acpidump_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UTILS);
> diff --git a/src/acpi/acpiinfo/acpiinfo.c b/src/acpi/acpiinfo/acpiinfo.c
> index e83f09e..4b68ee3 100644
> --- a/src/acpi/acpiinfo/acpiinfo.c
> +++ b/src/acpi/acpiinfo/acpiinfo.c
> @@ -151,6 +151,6 @@ static fwts_framework_ops acpiinfo_ops = {
> .minor_tests = acpiinfo_tests
> };
>
> -FWTS_REGISTER(acpiinfo, &acpiinfo_ops, FWTS_TEST_EARLY, FWTS_FLAG_BATCH);
> +FWTS_REGISTER("acpiinfo", &acpiinfo_ops, FWTS_TEST_EARLY, FWTS_FLAG_BATCH);
>
> #endif
> diff --git a/src/acpi/acpitables/acpitables.c b/src/acpi/acpitables/acpitables.c
> index 853aa5b..217b73b 100644
> --- a/src/acpi/acpitables/acpitables.c
> +++ b/src/acpi/acpitables/acpitables.c
> @@ -525,4 +525,4 @@ static fwts_framework_ops acpi_table_check_ops = {
> .minor_tests = acpi_table_check_tests
> };
>
> -FWTS_REGISTER(acpitables, &acpi_table_check_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
> +FWTS_REGISTER("acpitables", &acpi_table_check_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
> diff --git a/src/acpi/apicinstance/apicinstance.c b/src/acpi/apicinstance/apicinstance.c
> index ba9d392..245aa48 100644
> --- a/src/acpi/apicinstance/apicinstance.c
> +++ b/src/acpi/apicinstance/apicinstance.c
> @@ -83,6 +83,6 @@ static fwts_framework_ops apicinstance_ops = {
> .minor_tests = apicinstance_tests
> };
>
> -FWTS_REGISTER(apicinstance, &apicinstance_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
> +FWTS_REGISTER("apicinstance", &apicinstance_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
>
> #endif
> diff --git a/src/acpi/battery/battery.c b/src/acpi/battery/battery.c
> index faccd50..2fbc228 100644
> --- a/src/acpi/battery/battery.c
> +++ b/src/acpi/battery/battery.c
> @@ -291,6 +291,6 @@ static fwts_framework_ops battery_ops = {
> .minor_tests = battery_tests
> };
>
> -FWTS_REGISTER(battery, &battery_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_INTERACTIVE);
> +FWTS_REGISTER("battery", &battery_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_INTERACTIVE);
>
> #endif
> diff --git a/src/acpi/brightness/brightness.c b/src/acpi/brightness/brightness.c
> index 395a3ab..f523cbf 100644
> --- a/src/acpi/brightness/brightness.c
> +++ b/src/acpi/brightness/brightness.c
> @@ -386,6 +386,6 @@ static fwts_framework_ops brightness_ops = {
> .minor_tests = brightness_tests
> };
>
> -FWTS_REGISTER(brightness, &brightness_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_INTERACTIVE);
> +FWTS_REGISTER("brightness", &brightness_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_INTERACTIVE);
>
> #endif
> diff --git a/src/acpi/checksum/checksum.c b/src/acpi/checksum/checksum.c
> index a10774d..e56ca66 100644
> --- a/src/acpi/checksum/checksum.c
> +++ b/src/acpi/checksum/checksum.c
> @@ -155,4 +155,4 @@ static fwts_framework_ops checksum_ops = {
> .minor_tests = checksum_tests
> };
>
> -FWTS_REGISTER(checksum, &checksum_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
> +FWTS_REGISTER("checksum", &checksum_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
> diff --git a/src/acpi/cstates/cstates.c b/src/acpi/cstates/cstates.c
> index e32f8ad..93a7e50 100644
> --- a/src/acpi/cstates/cstates.c
> +++ b/src/acpi/cstates/cstates.c
> @@ -254,6 +254,6 @@ static fwts_framework_ops cstates_ops = {
> .minor_tests = cstates_tests
> };
>
> -FWTS_REGISTER(cstates, &cstates_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
> +FWTS_REGISTER("cstates", &cstates_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
>
> #endif
> diff --git a/src/acpi/dmar/dmar.c b/src/acpi/dmar/dmar.c
> index 39ce886..bd6511b 100644
> --- a/src/acpi/dmar/dmar.c
> +++ b/src/acpi/dmar/dmar.c
> @@ -336,6 +336,6 @@ static fwts_framework_ops dmar_ops = {
> .minor_tests = dmar_tests
> };
>
> -FWTS_REGISTER(dmar, &dmar_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
> +FWTS_REGISTER("dmar", &dmar_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
>
> #endif
> diff --git a/src/acpi/fadt/fadt.c b/src/acpi/fadt/fadt.c
> index 2863599..d7ee0aa 100644
> --- a/src/acpi/fadt/fadt.c
> +++ b/src/acpi/fadt/fadt.c
> @@ -138,6 +138,6 @@ static fwts_framework_ops fadt_ops = {
> .minor_tests = fadt_tests
> };
>
> -FWTS_REGISTER(fadt, &fadt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
> +FWTS_REGISTER("fadt", &fadt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
>
> #endif
> diff --git a/src/acpi/fan/fan.c b/src/acpi/fan/fan.c
> index 53f198a..586ec50 100644
> --- a/src/acpi/fan/fan.c
> +++ b/src/acpi/fan/fan.c
> @@ -255,6 +255,6 @@ static fwts_framework_ops fan_ops = {
> .minor_tests = fan_tests
> };
>
> -FWTS_REGISTER(fan, &fan_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
> +FWTS_REGISTER("fan", &fan_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
>
> #endif
> diff --git a/src/acpi/klog/klog.c b/src/acpi/klog/klog.c
> index 2f0ac1e..f0ce114 100644
> --- a/src/acpi/klog/klog.c
> +++ b/src/acpi/klog/klog.c
> @@ -85,4 +85,4 @@ static fwts_framework_ops klog_ops = {
> .minor_tests = klog_tests
> };
>
> -FWTS_REGISTER(klog, &klog_ops, FWTS_TEST_EARLY, FWTS_FLAG_BATCH);
> +FWTS_REGISTER("klog", &klog_ops, FWTS_TEST_EARLY, FWTS_FLAG_BATCH);
> diff --git a/src/acpi/lid/lid.c b/src/acpi/lid/lid.c
> index 2896ada..c8827af 100644
> --- a/src/acpi/lid/lid.c
> +++ b/src/acpi/lid/lid.c
> @@ -201,6 +201,6 @@ static fwts_framework_ops lid_ops = {
> .minor_tests = lid_tests
> };
>
> -FWTS_REGISTER(lid, &lid_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_INTERACTIVE);
> +FWTS_REGISTER("lid", &lid_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_INTERACTIVE);
>
> #endif
> diff --git a/src/acpi/mcfg/mcfg.c b/src/acpi/mcfg/mcfg.c
> index 310e6e4..29538db 100644
> --- a/src/acpi/mcfg/mcfg.c
> +++ b/src/acpi/mcfg/mcfg.c
> @@ -284,6 +284,6 @@ static fwts_framework_ops mcfg_ops = {
> .minor_tests = mcfg_tests
> };
>
> -FWTS_REGISTER(mcfg, &mcfg_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
> +FWTS_REGISTER("mcfg", &mcfg_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
>
> #endif
> diff --git a/src/acpi/method/method.c b/src/acpi/method/method.c
> index 1c30027..0b8dafd 100644
> --- a/src/acpi/method/method.c
> +++ b/src/acpi/method/method.c
> @@ -4158,4 +4158,4 @@ static fwts_framework_ops method_ops = {
> .minor_tests = method_tests
> };
>
> -FWTS_REGISTER(method, &method_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
> +FWTS_REGISTER("method", &method_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
> diff --git a/src/acpi/osilinux/osilinux.c b/src/acpi/osilinux/osilinux.c
> index 3a15cf7..32963cc 100644
> --- a/src/acpi/osilinux/osilinux.c
> +++ b/src/acpi/osilinux/osilinux.c
> @@ -100,6 +100,6 @@ static fwts_framework_ops osilinux_ops = {
> .minor_tests = osilinux_tests
> };
>
> -FWTS_REGISTER(osilinux, &osilinux_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
> +FWTS_REGISTER("osilinux", &osilinux_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
>
> #endif
> diff --git a/src/acpi/pcc/pcc.c b/src/acpi/pcc/pcc.c
> index af3c105..36eb654 100644
> --- a/src/acpi/pcc/pcc.c
> +++ b/src/acpi/pcc/pcc.c
> @@ -468,6 +468,6 @@ static fwts_framework_ops pcc_ops = {
> .minor_tests = pcc_tests
> };
>
> -FWTS_REGISTER(pcc, &pcc_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
> +FWTS_REGISTER("pcc", &pcc_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
>
> #endif
> diff --git a/src/acpi/powerbutton/powerbutton.c b/src/acpi/powerbutton/powerbutton.c
> index 7015c11..7820f65 100644
> --- a/src/acpi/powerbutton/powerbutton.c
> +++ b/src/acpi/powerbutton/powerbutton.c
> @@ -83,6 +83,6 @@ static fwts_framework_ops power_button_ops = {
> .minor_tests = power_button_tests
> };
>
> -FWTS_REGISTER(power_button, &power_button_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_INTERACTIVE);
> +FWTS_REGISTER("power_button", &power_button_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_INTERACTIVE);
>
> #endif
> diff --git a/src/acpi/s3/s3.c b/src/acpi/s3/s3.c
> index 2da2960..ae89423 100644
> --- a/src/acpi/s3/s3.c
> +++ b/src/acpi/s3/s3.c
> @@ -406,6 +406,6 @@ static fwts_framework_ops s3_ops = {
> .options_check = s3_options_check,
> };
>
> -FWTS_REGISTER(s3, &s3_ops, FWTS_TEST_LATE, FWTS_FLAG_POWER_STATES | FWTS_FLAG_ROOT_PRIV);
> +FWTS_REGISTER("s3", &s3_ops, FWTS_TEST_LATE, FWTS_FLAG_POWER_STATES | FWTS_FLAG_ROOT_PRIV);
>
> #endif
> diff --git a/src/acpi/s3power/s3power.c b/src/acpi/s3power/s3power.c
> index 7b81a84..d65d872 100644
> --- a/src/acpi/s3power/s3power.c
> +++ b/src/acpi/s3power/s3power.c
> @@ -282,6 +282,6 @@ static fwts_framework_ops s3power_ops = {
> .options_check = s3power_options_check,
> };
>
> -FWTS_REGISTER(s3power, &s3power_ops, FWTS_TEST_LATE, FWTS_FLAG_POWER_STATES | FWTS_FLAG_ROOT_PRIV);
> +FWTS_REGISTER("s3power", &s3power_ops, FWTS_TEST_LATE, FWTS_FLAG_POWER_STATES | FWTS_FLAG_ROOT_PRIV);
>
> #endif
> diff --git a/src/acpi/s4/s4.c b/src/acpi/s4/s4.c
> index ed14a36..59ffcaf 100644
> --- a/src/acpi/s4/s4.c
> +++ b/src/acpi/s4/s4.c
> @@ -472,6 +472,6 @@ static fwts_framework_ops s4_ops = {
> .options_check = s4_options_check
> };
>
> -FWTS_REGISTER(s4, &s4_ops, FWTS_TEST_LAST, FWTS_FLAG_POWER_STATES | FWTS_FLAG_ROOT_PRIV);
> +FWTS_REGISTER("s4", &s4_ops, FWTS_TEST_LAST, FWTS_FLAG_POWER_STATES | FWTS_FLAG_ROOT_PRIV);
>
> #endif
> diff --git a/src/acpi/syntaxcheck/syntaxcheck.c b/src/acpi/syntaxcheck/syntaxcheck.c
> index b3f425c..2e111e1 100644
> --- a/src/acpi/syntaxcheck/syntaxcheck.c
> +++ b/src/acpi/syntaxcheck/syntaxcheck.c
> @@ -365,6 +365,6 @@ static fwts_framework_ops syntaxcheck_ops = {
> .minor_tests = syntaxcheck_tests
> };
>
> -FWTS_REGISTER(syntaxcheck, &syntaxcheck_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
> +FWTS_REGISTER("syntaxcheck", &syntaxcheck_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
>
> #endif
> diff --git a/src/acpi/wakealarm/wakealarm.c b/src/acpi/wakealarm/wakealarm.c
> index e6065a6..5873483 100644
> --- a/src/acpi/wakealarm/wakealarm.c
> +++ b/src/acpi/wakealarm/wakealarm.c
> @@ -122,6 +122,6 @@ static fwts_framework_ops wakealarm_ops = {
> .minor_tests = wakealarm_tests
> };
>
> -FWTS_REGISTER(wakealarm, &wakealarm_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
> +FWTS_REGISTER("wakealarm", &wakealarm_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
>
> #endif
> diff --git a/src/acpi/wmi/wmi.c b/src/acpi/wmi/wmi.c
> index 6009aa9..75b0aa4 100644
> --- a/src/acpi/wmi/wmi.c
> +++ b/src/acpi/wmi/wmi.c
> @@ -381,6 +381,6 @@ static fwts_framework_ops wmi_ops = {
> .minor_tests = wmi_tests
> };
>
> -FWTS_REGISTER(wmi, &wmi_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
> +FWTS_REGISTER("wmi", &wmi_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
>
> #endif
> diff --git a/src/apic/apicedge/apicedge.c b/src/apic/apicedge/apicedge.c
> index 861cdce..e22080c 100644
> --- a/src/apic/apicedge/apicedge.c
> +++ b/src/apic/apicedge/apicedge.c
> @@ -111,6 +111,6 @@ static fwts_framework_ops apicedge_ops = {
> .minor_tests = apicedge_tests
> };
>
> -FWTS_REGISTER(apicedge, &apicedge_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
> +FWTS_REGISTER("apicedge", &apicedge_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
>
> #endif
> diff --git a/src/bios/bios32/bios32.c b/src/bios/bios32/bios32.c
> index c407d69..4e1a8a8 100644
> --- a/src/bios/bios32/bios32.c
> +++ b/src/bios/bios32/bios32.c
> @@ -164,7 +164,7 @@ static fwts_framework_ops bios32_ops = {
> .minor_tests = bios32_tests
> };
>
> -FWTS_REGISTER(bios32, &bios32_ops, FWTS_TEST_ANYTIME,
> +FWTS_REGISTER("bios32", &bios32_ops, FWTS_TEST_ANYTIME,
> FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
>
> #endif
> diff --git a/src/bios/bios_info/bios_info.c b/src/bios/bios_info/bios_info.c
> index 4bc9dee..df2a93e 100644
> --- a/src/bios/bios_info/bios_info.c
> +++ b/src/bios/bios_info/bios_info.c
> @@ -82,6 +82,6 @@ static fwts_framework_ops bios_info_ops = {
> .minor_tests = bios_info_tests
> };
>
> -FWTS_REGISTER(bios_info, &bios_info_ops, FWTS_TEST_FIRST, FWTS_FLAG_BATCH);
> +FWTS_REGISTER("bios_info", &bios_info_ops, FWTS_TEST_FIRST, FWTS_FLAG_BATCH);
>
> #endif
> diff --git a/src/bios/ebda_region/ebda_region.c b/src/bios/ebda_region/ebda_region.c
> index 23f642c..af1de35 100644
> --- a/src/bios/ebda_region/ebda_region.c
> +++ b/src/bios/ebda_region/ebda_region.c
> @@ -113,6 +113,6 @@ static fwts_framework_ops ebda_ops = {
> .minor_tests = ebda_tests
> };
>
> -FWTS_REGISTER(ebda, &ebda_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
> +FWTS_REGISTER("ebda", &ebda_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
>
> #endif
> diff --git a/src/bios/ebdadump/ebdadump.c b/src/bios/ebdadump/ebdadump.c
> index a6787e6..b758095 100644
> --- a/src/bios/ebdadump/ebdadump.c
> +++ b/src/bios/ebdadump/ebdadump.c
> @@ -84,7 +84,7 @@ static fwts_framework_ops ebdadump_ops = {
> .minor_tests = ebdadump_tests
> };
>
> -FWTS_REGISTER(ebdadump, &ebdadump_ops, FWTS_TEST_ANYTIME,
> +FWTS_REGISTER("ebdadump", &ebdadump_ops, FWTS_TEST_ANYTIME,
> FWTS_FLAG_UTILS | FWTS_FLAG_ROOT_PRIV);
>
> #endif
> diff --git a/src/bios/hdaaudio/hdaaudio.c b/src/bios/hdaaudio/hdaaudio.c
> index 3f15df5..47fd60e 100644
> --- a/src/bios/hdaaudio/hdaaudio.c
> +++ b/src/bios/hdaaudio/hdaaudio.c
> @@ -179,4 +179,4 @@ static fwts_framework_ops hda_audio_ops = {
> .minor_tests = hda_audio_tests
> };
>
> -FWTS_REGISTER(hda_audio, &hda_audio_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
> +FWTS_REGISTER("hda_audio", &hda_audio_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
> diff --git a/src/bios/memmapdump/memmapdump.c b/src/bios/memmapdump/memmapdump.c
> index b8c4603..8ebda8d 100644
> --- a/src/bios/memmapdump/memmapdump.c
> +++ b/src/bios/memmapdump/memmapdump.c
> @@ -51,6 +51,6 @@ static fwts_framework_ops memory_mapdump_ops = {
> .minor_tests = memory_mapdump_utils
> };
>
> -FWTS_REGISTER(memmapdump, &memory_mapdump_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UTILS);
> +FWTS_REGISTER("memmapdump", &memory_mapdump_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UTILS);
>
> #endif
> diff --git a/src/bios/mtrr/mtrr.c b/src/bios/mtrr/mtrr.c
> index 9449760..0a83d58 100644
> --- a/src/bios/mtrr/mtrr.c
> +++ b/src/bios/mtrr/mtrr.c
> @@ -519,6 +519,6 @@ static fwts_framework_ops mtrr_ops = {
> .minor_tests = mtrr_tests
> };
>
> -FWTS_REGISTER(mtrr, &mtrr_ops, FWTS_TEST_EARLY, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
> +FWTS_REGISTER("mtrr", &mtrr_ops, FWTS_TEST_EARLY, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
>
> #endif
> diff --git a/src/bios/multiproc/mpcheck.c b/src/bios/multiproc/mpcheck.c
> index cdd269c..5c211d3 100644
> --- a/src/bios/multiproc/mpcheck.c
> +++ b/src/bios/multiproc/mpcheck.c
> @@ -577,6 +577,6 @@ static fwts_framework_ops mpcheck_ops = {
> .minor_tests = mpcheck_tests,
> };
>
> -FWTS_REGISTER(mpcheck, &mpcheck_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
> +FWTS_REGISTER("mpcheck", &mpcheck_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
>
> #endif
> diff --git a/src/bios/multiproc/mpdump.c b/src/bios/multiproc/mpdump.c
> index ee68270..ac6c684 100644
> --- a/src/bios/multiproc/mpdump.c
> +++ b/src/bios/multiproc/mpdump.c
> @@ -528,6 +528,6 @@ static fwts_framework_ops mpdump_ops = {
> .minor_tests = mpdump_tests,
> };
>
> -FWTS_REGISTER(mpdump, &mpdump_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UTILS | FWTS_FLAG_ROOT_PRIV);
> +FWTS_REGISTER("mpdump", &mpdump_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UTILS | FWTS_FLAG_ROOT_PRIV);
>
> #endif
> diff --git a/src/bios/os2gap/os2gap.c b/src/bios/os2gap/os2gap.c
> index e711887..2dd4c64 100644
> --- a/src/bios/os2gap/os2gap.c
> +++ b/src/bios/os2gap/os2gap.c
> @@ -78,6 +78,6 @@ static fwts_framework_ops os2gap_ops = {
> .minor_tests = os2gap_tests
> };
>
> -FWTS_REGISTER(os2gap, &os2gap_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
> +FWTS_REGISTER("os2gap", &os2gap_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
>
> #endif
> diff --git a/src/bios/pciirq/pciirq.c b/src/bios/pciirq/pciirq.c
> index 9a9a10d..4aa2501 100644
> --- a/src/bios/pciirq/pciirq.c
> +++ b/src/bios/pciirq/pciirq.c
> @@ -252,6 +252,6 @@ static fwts_framework_ops pciirq_ops = {
> .minor_tests = pciirq_tests
> };
>
> -FWTS_REGISTER(pciirq, &pciirq_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
> +FWTS_REGISTER("pciirq", &pciirq_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
>
> #endif
> diff --git a/src/bios/pnp/pnp.c b/src/bios/pnp/pnp.c
> index d25ae1b..6079aae 100644
> --- a/src/bios/pnp/pnp.c
> +++ b/src/bios/pnp/pnp.c
> @@ -189,6 +189,6 @@ static fwts_framework_ops pnp_ops = {
> .minor_tests = pnp_tests
> };
>
> -FWTS_REGISTER(pnp, &pnp_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
> +FWTS_REGISTER("pnp", &pnp_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
>
> #endif
> diff --git a/src/bios/romdump/romdump.c b/src/bios/romdump/romdump.c
> index 18bb555..960cee4 100644
> --- a/src/bios/romdump/romdump.c
> +++ b/src/bios/romdump/romdump.c
> @@ -90,6 +90,6 @@ static fwts_framework_ops romdump_ops = {
> .minor_tests = romdump_tests
> };
>
> -FWTS_REGISTER(romdump, &romdump_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UTILS | FWTS_FLAG_ROOT_PRIV);
> +FWTS_REGISTER("romdump", &romdump_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UTILS | FWTS_FLAG_ROOT_PRIV);
>
> #endif
> diff --git a/src/bios/smbios/smbios.c b/src/bios/smbios/smbios.c
> index a4c12b1..6fc2fa4 100644
> --- a/src/bios/smbios/smbios.c
> +++ b/src/bios/smbios/smbios.c
> @@ -130,6 +130,6 @@ static fwts_framework_ops smbios_ops = {
> .minor_tests = smbios_tests
> };
>
> -FWTS_REGISTER(smbios, &smbios_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
> +FWTS_REGISTER("smbios", &smbios_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
>
> #endif
> diff --git a/src/cmos/cmosdump/cmosdump.c b/src/cmos/cmosdump/cmosdump.c
> index 9e8e5d8..22294c0 100644
> --- a/src/cmos/cmosdump/cmosdump.c
> +++ b/src/cmos/cmosdump/cmosdump.c
> @@ -454,6 +454,6 @@ static fwts_framework_ops cmosdump_ops = {
> .minor_tests = cmosdump_tests
> };
>
> -FWTS_REGISTER(cmosdump, &cmosdump_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UTILS | FWTS_FLAG_ROOT_PRIV);
> +FWTS_REGISTER("cmosdump", &cmosdump_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UTILS | FWTS_FLAG_ROOT_PRIV);
>
> #endif
> diff --git a/src/cpu/cpufreq/cpufreq.c b/src/cpu/cpufreq/cpufreq.c
> index ac8f2d6..1544b42 100644
> --- a/src/cpu/cpufreq/cpufreq.c
> +++ b/src/cpu/cpufreq/cpufreq.c
> @@ -706,6 +706,6 @@ static fwts_framework_ops cpufreq_ops = {
> .minor_tests = cpufreq_tests
> };
>
> -FWTS_REGISTER(cpufreq, &cpufreq_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
> +FWTS_REGISTER("cpufreq", &cpufreq_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
>
> #endif
> diff --git a/src/cpu/maxfreq/maxfreq.c b/src/cpu/maxfreq/maxfreq.c
> index 8224b7b..86aad42 100644
> --- a/src/cpu/maxfreq/maxfreq.c
> +++ b/src/cpu/maxfreq/maxfreq.c
> @@ -192,6 +192,6 @@ static fwts_framework_ops maxfreq_ops = {
> .minor_tests = maxfreq_tests
> };
>
> -FWTS_REGISTER(maxfreq, &maxfreq_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
> +FWTS_REGISTER("maxfreq", &maxfreq_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
>
> #endif
> diff --git a/src/cpu/microcode/microcode.c b/src/cpu/microcode/microcode.c
> index 19cad5b..3efed35 100644
> --- a/src/cpu/microcode/microcode.c
> +++ b/src/cpu/microcode/microcode.c
> @@ -202,6 +202,6 @@ static fwts_framework_ops microcode_ops = {
> .minor_tests = microcode_tests
> };
>
> -FWTS_REGISTER(microcode, µcode_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
> +FWTS_REGISTER("microcode", µcode_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
>
> #endif
> diff --git a/src/cpu/msr/msr.c b/src/cpu/msr/msr.c
> index ae3b807..be9608c 100644
> --- a/src/cpu/msr/msr.c
> +++ b/src/cpu/msr/msr.c
> @@ -580,6 +580,6 @@ static fwts_framework_ops msr_ops = {
> .minor_tests = msr_tests
> };
>
> -FWTS_REGISTER(msr, &msr_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
> +FWTS_REGISTER("msr", &msr_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
>
> #endif
> diff --git a/src/cpu/nx/nx.c b/src/cpu/nx/nx.c
> index f5ed505..66ff2b9 100644
> --- a/src/cpu/nx/nx.c
> +++ b/src/cpu/nx/nx.c
> @@ -186,6 +186,6 @@ static fwts_framework_ops nx_ops = {
> .minor_tests = nx_tests
> };
>
> -FWTS_REGISTER(nx, &nx_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
> +FWTS_REGISTER("nx", &nx_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
>
> #endif
> diff --git a/src/cpu/virt/virt.c b/src/cpu/virt/virt.c
> index 2ff3ae2..29dfa17 100644
> --- a/src/cpu/virt/virt.c
> +++ b/src/cpu/virt/virt.c
> @@ -89,6 +89,6 @@ static fwts_framework_ops virt_ops = {
> .minor_tests = virt_tests
> };
>
> -FWTS_REGISTER(virt, &virt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
> +FWTS_REGISTER("virt", &virt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
>
> #endif
> diff --git a/src/dmi/dmi_decode/dmi_decode.c b/src/dmi/dmi_decode/dmi_decode.c
> index bf844f2..e80daaa 100644
> --- a/src/dmi/dmi_decode/dmi_decode.c
> +++ b/src/dmi/dmi_decode/dmi_decode.c
> @@ -1292,6 +1292,6 @@ static fwts_framework_ops dmi_decode_ops = {
> .minor_tests = dmi_decode_tests
> };
>
> -FWTS_REGISTER(dmi_decode, &dmi_decode_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
> +FWTS_REGISTER("dmi_decode", &dmi_decode_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
>
> #endif
> diff --git a/src/example/blank/blank.c b/src/example/blank/blank.c
> index 5333ab6..b923506 100644
> --- a/src/example/blank/blank.c
> +++ b/src/example/blank/blank.c
> @@ -95,4 +95,4 @@ static fwts_framework_ops example_ops = {
> /*
> * See fwts_framework.h for flags,
> */
> -FWTS_REGISTER(example, &example_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
> +FWTS_REGISTER("example", &example_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
> diff --git a/src/hotkey/hotkey/hotkey.c b/src/hotkey/hotkey/hotkey.c
> index 4f830e6..38be7b0 100644
> --- a/src/hotkey/hotkey/hotkey.c
> +++ b/src/hotkey/hotkey/hotkey.c
> @@ -262,6 +262,6 @@ static fwts_framework_ops hotkey_ops = {
> .minor_tests = hotkey_tests
> };
>
> -FWTS_REGISTER(hotkey, &hotkey_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_INTERACTIVE | FWTS_FLAG_ROOT_PRIV);
> +FWTS_REGISTER("hotkey", &hotkey_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_INTERACTIVE | FWTS_FLAG_ROOT_PRIV);
>
> #endif
> diff --git a/src/hpet/hpet_check/hpet_check.c b/src/hpet/hpet_check/hpet_check.c
> index 359c2cc..7709f88 100644
> --- a/src/hpet/hpet_check/hpet_check.c
> +++ b/src/hpet/hpet_check/hpet_check.c
> @@ -426,7 +426,7 @@ static fwts_framework_ops hpet_check_ops = {
> .minor_tests = hpet_check_tests
> };
>
> -FWTS_REGISTER(hpet_check, &hpet_check_ops, FWTS_TEST_ANYTIME,
> +FWTS_REGISTER("hpet_check", &hpet_check_ops, FWTS_TEST_ANYTIME,
> FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
>
> #endif
> diff --git a/src/kernel/oops/oops.c b/src/kernel/oops/oops.c
> index ee88960..c0f5bea 100644
> --- a/src/kernel/oops/oops.c
> +++ b/src/kernel/oops/oops.c
> @@ -86,4 +86,4 @@ static fwts_framework_ops oops_ops = {
> .minor_tests = oops_tests
> };
>
> -FWTS_REGISTER(oops, &oops_ops, FWTS_TEST_EARLY, FWTS_FLAG_BATCH);
> +FWTS_REGISTER("oops", &oops_ops, FWTS_TEST_EARLY, FWTS_FLAG_BATCH);
> diff --git a/src/kernel/version/version.c b/src/kernel/version/version.c
> index fc54b00..3c7fb29 100644
> --- a/src/kernel/version/version.c
> +++ b/src/kernel/version/version.c
> @@ -89,4 +89,4 @@ static fwts_framework_ops version_ops = {
> .minor_tests = version_tests
> };
>
> -FWTS_REGISTER(version, &version_ops, FWTS_TEST_FIRST, FWTS_FLAG_BATCH);
> +FWTS_REGISTER("version", &version_ops, FWTS_TEST_FIRST, FWTS_FLAG_BATCH);
> diff --git a/src/lib/include/fwts_framework.h b/src/lib/include/fwts_framework.h
> index edc07c2..0c0c276 100644
> --- a/src/lib/include/fwts_framework.h
> +++ b/src/lib/include/fwts_framework.h
> @@ -242,11 +242,11 @@ static inline int fwts_tests_passed(const fwts_framework *fw)
>
> #define FWTS_REGISTER(name, ops, priority, flags) \
> \
> -static void name ## init (void) __attribute__ ((constructor)); \
> +static void __test_init (void) __attribute__ ((constructor)); \
> \
> -static void name ## init (void) \
> +static void __test_init (void) \
> { \
> - fwts_framework_test_add(# name, ops, priority, flags); \
> + fwts_framework_test_add(name, ops, priority, flags); \
> } \
>
> #endif
> diff --git a/src/pci/aspm/aspm.c b/src/pci/aspm/aspm.c
> index 519f24f..035d1b0 100644
> --- a/src/pci/aspm/aspm.c
> +++ b/src/pci/aspm/aspm.c
> @@ -355,4 +355,4 @@ static fwts_framework_ops aspm_ops = {
> .minor_tests = aspm_tests
> };
>
> -FWTS_REGISTER(aspm, &aspm_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
> +FWTS_REGISTER("aspm", &aspm_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
> diff --git a/src/pci/crs/crs.c b/src/pci/crs/crs.c
> index 2be7458..74d7c3c 100644
> --- a/src/pci/crs/crs.c
> +++ b/src/pci/crs/crs.c
> @@ -140,6 +140,6 @@ static fwts_framework_ops crs_ops = {
> .minor_tests = crs_tests
> };
>
> -FWTS_REGISTER(crs, &crs_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
> +FWTS_REGISTER("crs", &crs_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
>
> #endif
> diff --git a/src/pci/maxreadreq/maxreadreq.c b/src/pci/maxreadreq/maxreadreq.c
> index 38c75ef..0168356 100644
> --- a/src/pci/maxreadreq/maxreadreq.c
> +++ b/src/pci/maxreadreq/maxreadreq.c
> @@ -151,4 +151,4 @@ static fwts_framework_ops maxreadreq_ops = {
> .minor_tests = maxreadreq_tests
> };
>
> -FWTS_REGISTER(maxreadreq, &maxreadreq_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
> +FWTS_REGISTER("maxreadreq", &maxreadreq_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
> diff --git a/src/uefi/csm/csm.c b/src/uefi/csm/csm.c
> index 8ee27d6..f4468bc 100644
> --- a/src/uefi/csm/csm.c
> +++ b/src/uefi/csm/csm.c
> @@ -112,6 +112,6 @@ static fwts_framework_ops csm_ops = {
> .minor_tests = csm_tests
> };
>
> -FWTS_REGISTER(csm, &csm_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
> +FWTS_REGISTER("csm", &csm_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
>
> #endif
> diff --git a/src/uefi/uefidump/uefidump.c b/src/uefi/uefidump/uefidump.c
> index 5f2e2b6..622abe3 100644
> --- a/src/uefi/uefidump/uefidump.c
> +++ b/src/uefi/uefidump/uefidump.c
> @@ -781,4 +781,4 @@ static fwts_framework_ops uefidump_ops = {
> .minor_tests = uefidump_tests
> };
>
> -FWTS_REGISTER(uefidump, &uefidump_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UTILS | FWTS_FLAG_ROOT_PRIV);
> +FWTS_REGISTER("uefidump", &uefidump_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UTILS | FWTS_FLAG_ROOT_PRIV);
> diff --git a/src/uefi/uefirttime/uefirttime.c b/src/uefi/uefirttime/uefirttime.c
> index 6f11e7f..2094677 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_UNSAFE | FWTS_FLAG_ROOT_PRIV);
> diff --git a/src/uefi/uefirtvariable/uefirtvariable.c b/src/uefi/uefirtvariable/uefirtvariable.c
> index 0b3db20..52c3d2d 100644
> --- a/src/uefi/uefirtvariable/uefirtvariable.c
> +++ b/src/uefi/uefirtvariable/uefirtvariable.c
> @@ -667,4 +667,4 @@ static fwts_framework_ops uefirtvariable_ops = {
> .minor_tests = uefirtvariable_tests
> };
>
> -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_UNSAFE | FWTS_FLAG_ROOT_PRIV);
> --
> 1.8.0
>
Acked-by: Keng-Yu Lin <kengyu at canonical.com>
More information about the fwts-devel
mailing list