[PATCH] lib + tests: bulk rename of fwts flag macros
Colin King
colin.king at canonical.com
Thu Sep 6 10:18:32 UTC 2012
From: Colin Ian King <colin.king at canonical.com>
The FWTS_FRAMEWORK_FLAGS_ macros were originally really rather too long
to type, so there were a bunch of #defines to shorten these for common
use in just the fwts tests. However, the aliasing of these is really not
a good idea after all as it leads to confusing mixes of the same value
with different names, especially in the fwts framework, for example
FWTS_BATCH is really an alias of FWTS_FRAMEWORK_FLAGS_BATCH (urgh!)
This patch simplifies the matter by renaming all these macros from
FWTS_FRAME_WORK_FLAGS* to FWTS_FLAG_* and we replace the bad short cut
versions to the FWTS_FLAG_* equivalent.
This changes no functionality in the code whatsoever, it just tidies
it up and makes it more understandable.
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/common/common.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/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 | 67 ++++++-------
src/lib/src/fwts_framework.c | 172 +++++++++++++++++-----------------
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 +-
60 files changed, 171 insertions(+), 184 deletions(-)
diff --git a/src/acpi/ac_adapter/ac_adapter.c b/src/acpi/ac_adapter/ac_adapter.c
index 021713b..4fdc6ea 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_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 8d5c96f..9893b7d 100644
--- a/src/acpi/acpidump/acpidump.c
+++ b/src/acpi/acpidump/acpidump.c
@@ -1694,4 +1694,4 @@ static fwts_framework_ops acpidump_ops = {
.minor_tests = acpidump_tests
};
-FWTS_REGISTER(acpidump, &acpidump_ops, FWTS_TEST_ANYTIME, FWTS_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 cdd2492..c72ba20 100644
--- a/src/acpi/acpiinfo/acpiinfo.c
+++ b/src/acpi/acpiinfo/acpiinfo.c
@@ -247,6 +247,6 @@ static fwts_framework_ops acpiinfo_ops = {
.minor_tests = acpiinfo_tests
};
-FWTS_REGISTER(acpiinfo, &acpiinfo_ops, FWTS_TEST_EARLY, FWTS_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 432407c..7f1a748 100644
--- a/src/acpi/acpitables/acpitables.c
+++ b/src/acpi/acpitables/acpitables.c
@@ -468,4 +468,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_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 9ee7e29..60416a2 100644
--- a/src/acpi/apicinstance/apicinstance.c
+++ b/src/acpi/apicinstance/apicinstance.c
@@ -81,4 +81,4 @@ static fwts_framework_ops apicinstance_ops = {
.minor_tests = apicinstance_tests
};
-FWTS_REGISTER(apicinstance, &apicinstance_ops, FWTS_TEST_ANYTIME, FWTS_BATCH);
+FWTS_REGISTER(apicinstance, &apicinstance_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
diff --git a/src/acpi/battery/battery.c b/src/acpi/battery/battery.c
index 47771b0..79e30e2 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_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 fb8d569..f85a06a 100644
--- a/src/acpi/brightness/brightness.c
+++ b/src/acpi/brightness/brightness.c
@@ -384,6 +384,6 @@ static fwts_framework_ops brightness_ops = {
.minor_tests = brightness_tests
};
-FWTS_REGISTER(brightness, &brightness_ops, FWTS_TEST_ANYTIME, FWTS_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 9918a62..6e937ec 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_BATCH);
+FWTS_REGISTER(checksum, &checksum_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
diff --git a/src/acpi/common/common.c b/src/acpi/common/common.c
index 7ce596b..ef89314 100644
--- a/src/acpi/common/common.c
+++ b/src/acpi/common/common.c
@@ -83,6 +83,6 @@ static fwts_framework_ops dmesg_common_ops = {
.minor_tests = dmesg_common_tests
};
-FWTS_REGISTER(dmesg_common, &dmesg_common_ops, FWTS_TEST_EARLY, FWTS_BATCH);
+FWTS_REGISTER(dmesg_common, &dmesg_common_ops, FWTS_TEST_EARLY, FWTS_FLAG_BATCH);
#endif
diff --git a/src/acpi/cstates/cstates.c b/src/acpi/cstates/cstates.c
index 40f9122..26cf2e6 100644
--- a/src/acpi/cstates/cstates.c
+++ b/src/acpi/cstates/cstates.c
@@ -281,6 +281,6 @@ static fwts_framework_ops cstates_ops = {
.minor_tests = cstates_tests
};
-FWTS_REGISTER(cstates, &cstates_ops, FWTS_TEST_ANYTIME, FWTS_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 7fa1a60..3200a56 100644
--- a/src/acpi/dmar/dmar.c
+++ b/src/acpi/dmar/dmar.c
@@ -331,6 +331,6 @@ static fwts_framework_ops dmar_ops = {
.minor_tests = dmar_tests
};
-FWTS_REGISTER(dmar, &dmar_ops, FWTS_TEST_ANYTIME, FWTS_BATCH_EXPERIMENTAL);
+FWTS_REGISTER(dmar, &dmar_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH_EXPERIMENTAL);
#endif
diff --git a/src/acpi/fadt/fadt.c b/src/acpi/fadt/fadt.c
index d41865a..22dc341 100644
--- a/src/acpi/fadt/fadt.c
+++ b/src/acpi/fadt/fadt.c
@@ -136,6 +136,6 @@ static fwts_framework_ops fadt_ops = {
.minor_tests = fadt_tests
};
-FWTS_REGISTER(fadt, &fadt_ops, FWTS_TEST_ANYTIME, FWTS_BATCH | FWTS_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 5e9bb04..4a1a182 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_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 13fa1e8..488d9fb 100644
--- a/src/acpi/klog/klog.c
+++ b/src/acpi/klog/klog.c
@@ -83,4 +83,4 @@ static fwts_framework_ops klog_ops = {
.minor_tests = klog_tests
};
-FWTS_REGISTER(klog, &klog_ops, FWTS_TEST_EARLY, FWTS_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 05b34e8..dbf8330 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_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 62c9afb..f4cd53c 100644
--- a/src/acpi/mcfg/mcfg.c
+++ b/src/acpi/mcfg/mcfg.c
@@ -250,6 +250,6 @@ static fwts_framework_ops mcfg_ops = {
.minor_tests = mcfg_tests
};
-FWTS_REGISTER(mcfg, &mcfg_ops, FWTS_TEST_ANYTIME, FWTS_BATCH | FWTS_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 377b7bc..5220109 100644
--- a/src/acpi/method/method.c
+++ b/src/acpi/method/method.c
@@ -2242,4 +2242,4 @@ static fwts_framework_ops method_ops = {
.minor_tests = method_tests
};
-FWTS_REGISTER(method, &method_ops, FWTS_TEST_ANYTIME, FWTS_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 31e4711..9719429 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_BATCH);
+FWTS_REGISTER(osilinux, &osilinux_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
#endif
diff --git a/src/acpi/powerbutton/powerbutton.c b/src/acpi/powerbutton/powerbutton.c
index ba83c01..4090e78 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_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 76bec19..ece6799 100644
--- a/src/acpi/s3/s3.c
+++ b/src/acpi/s3/s3.c
@@ -396,6 +396,6 @@ static fwts_framework_ops s3_ops = {
.options_check = s3_options_check,
};
-FWTS_REGISTER(s3, &s3_ops, FWTS_TEST_LATE, FWTS_POWER_STATES | FWTS_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 b0ff161..e5c4ba0 100644
--- a/src/acpi/s3power/s3power.c
+++ b/src/acpi/s3power/s3power.c
@@ -276,6 +276,6 @@ static fwts_framework_ops s3power_ops = {
.options_check = s3power_options_check,
};
-FWTS_REGISTER(s3power, &s3power_ops, FWTS_TEST_LATE, FWTS_POWER_STATES | FWTS_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 087b881..23f8790 100644
--- a/src/acpi/s4/s4.c
+++ b/src/acpi/s4/s4.c
@@ -459,6 +459,6 @@ static fwts_framework_ops s4_ops = {
.options_check = s4_options_check
};
-FWTS_REGISTER(s4, &s4_ops, FWTS_TEST_LAST, FWTS_POWER_STATES | FWTS_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 083622c..4f5d43b 100644
--- a/src/acpi/syntaxcheck/syntaxcheck.c
+++ b/src/acpi/syntaxcheck/syntaxcheck.c
@@ -361,6 +361,6 @@ static fwts_framework_ops syntaxcheck_ops = {
.minor_tests = syntaxcheck_tests
};
-FWTS_REGISTER(syntaxcheck, &syntaxcheck_ops, FWTS_TEST_ANYTIME, FWTS_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 54fa614..3f440ca 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_BATCH | FWTS_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 5a188eb..588f8cf 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_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 3bf7748..4e6d1f5 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_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 77e9629..f993d38 100644
--- a/src/bios/bios32/bios32.c
+++ b/src/bios/bios32/bios32.c
@@ -164,6 +164,6 @@ static fwts_framework_ops bios32_ops = {
};
FWTS_REGISTER(bios32, &bios32_ops, FWTS_TEST_ANYTIME,
- FWTS_BATCH | FWTS_ROOT_PRIV);
+ 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 786052a..748aad8 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_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 c0cd5ae..ad03b36 100644
--- a/src/bios/ebda_region/ebda_region.c
+++ b/src/bios/ebda_region/ebda_region.c
@@ -109,6 +109,6 @@ static fwts_framework_ops ebda_ops = {
.minor_tests = ebda_tests
};
-FWTS_REGISTER(ebda, &ebda_ops, FWTS_TEST_ANYTIME, FWTS_BATCH | FWTS_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 7d16d9a..d7ac4cd 100644
--- a/src/bios/ebdadump/ebdadump.c
+++ b/src/bios/ebdadump/ebdadump.c
@@ -83,6 +83,6 @@ static fwts_framework_ops ebdadump_ops = {
};
FWTS_REGISTER(ebdadump, &ebdadump_ops, FWTS_TEST_ANYTIME,
- FWTS_UTILS | FWTS_ROOT_PRIV);
+ FWTS_FLAG_UTILS | FWTS_FLAG_ROOT_PRIV);
#endif
diff --git a/src/bios/hdaaudio/hdaaudio.c b/src/bios/hdaaudio/hdaaudio.c
index 1b6f88f..455a35a 100644
--- a/src/bios/hdaaudio/hdaaudio.c
+++ b/src/bios/hdaaudio/hdaaudio.c
@@ -183,4 +183,4 @@ static fwts_framework_ops hda_audio_ops = {
.minor_tests = hda_audio_tests
};
-FWTS_REGISTER(hda_audio, &hda_audio_ops, FWTS_TEST_ANYTIME, FWTS_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 08ad6a2..bbe0ccd 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_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 5bb27b8..56f348f 100644
--- a/src/bios/mtrr/mtrr.c
+++ b/src/bios/mtrr/mtrr.c
@@ -645,6 +645,6 @@ static fwts_framework_ops mtrr_ops = {
.minor_tests = mtrr_tests
};
-FWTS_REGISTER(mtrr, &mtrr_ops, FWTS_TEST_EARLY, FWTS_BATCH | FWTS_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 be1e2cb..37e6887 100644
--- a/src/bios/multiproc/mpcheck.c
+++ b/src/bios/multiproc/mpcheck.c
@@ -547,6 +547,6 @@ static fwts_framework_ops mpcheck_ops = {
.minor_tests = mpcheck_tests,
};
-FWTS_REGISTER(mpcheck, &mpcheck_ops, FWTS_TEST_ANYTIME, FWTS_BATCH | FWTS_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 a942675..ce3fa68 100644
--- a/src/bios/multiproc/mpdump.c
+++ b/src/bios/multiproc/mpdump.c
@@ -526,6 +526,6 @@ static fwts_framework_ops mpdump_ops = {
.minor_tests = mpdump_tests,
};
-FWTS_REGISTER(mpdump, &mpdump_ops, FWTS_TEST_ANYTIME, FWTS_UTILS | FWTS_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 386cc2a..b1e51d0 100644
--- a/src/bios/os2gap/os2gap.c
+++ b/src/bios/os2gap/os2gap.c
@@ -76,6 +76,6 @@ static fwts_framework_ops os2gap_ops = {
.minor_tests = os2gap_tests
};
-FWTS_REGISTER(os2gap, &os2gap_ops, FWTS_TEST_ANYTIME, FWTS_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 56d6693..3cdb532 100644
--- a/src/bios/pciirq/pciirq.c
+++ b/src/bios/pciirq/pciirq.c
@@ -249,6 +249,6 @@ static fwts_framework_ops pciirq_ops = {
.minor_tests = pciirq_tests
};
-FWTS_REGISTER(pciirq, &pciirq_ops, FWTS_TEST_ANYTIME, FWTS_BATCH | FWTS_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 8c637a2..3eb783b 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_BATCH | FWTS_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 56d41ff..2c3cc72 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_UTILS | FWTS_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 2a15979..338c310 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_BATCH | FWTS_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 131e2d2..83923bf 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_UTILS | FWTS_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 f4d0938..48e8c6d 100644
--- a/src/cpu/cpufreq/cpufreq.c
+++ b/src/cpu/cpufreq/cpufreq.c
@@ -694,6 +694,6 @@ static fwts_framework_ops cpufreq_ops = {
.minor_tests = cpufreq_tests
};
-FWTS_REGISTER(cpufreq, &cpufreq_ops, FWTS_TEST_ANYTIME, FWTS_BATCH_EXPERIMENTAL | FWTS_ROOT_PRIV);
+FWTS_REGISTER(cpufreq, &cpufreq_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH_EXPERIMENTAL | FWTS_FLAG_ROOT_PRIV);
#endif
diff --git a/src/cpu/maxfreq/maxfreq.c b/src/cpu/maxfreq/maxfreq.c
index dcf6311..16a8732 100644
--- a/src/cpu/maxfreq/maxfreq.c
+++ b/src/cpu/maxfreq/maxfreq.c
@@ -204,6 +204,6 @@ static fwts_framework_ops maxfreq_ops = {
.minor_tests = maxfreq_tests
};
-FWTS_REGISTER(maxfreq, &maxfreq_ops, FWTS_TEST_ANYTIME, FWTS_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 e83b0de..50b19e1 100644
--- a/src/cpu/microcode/microcode.c
+++ b/src/cpu/microcode/microcode.c
@@ -201,6 +201,6 @@ static fwts_framework_ops microcode_ops = {
.minor_tests = microcode_tests
};
-FWTS_REGISTER(microcode, µcode_ops, FWTS_TEST_ANYTIME, FWTS_BATCH | FWTS_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 0a8cf2c..edb0aee 100644
--- a/src/cpu/msr/msr.c
+++ b/src/cpu/msr/msr.c
@@ -574,6 +574,6 @@ static fwts_framework_ops msr_ops = {
.minor_tests = msr_tests
};
-FWTS_REGISTER(msr, &msr_ops, FWTS_TEST_ANYTIME, FWTS_BATCH | FWTS_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 4195c4b..c313ef3 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_BATCH | FWTS_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 dadc9a2..3382828 100644
--- a/src/cpu/virt/virt.c
+++ b/src/cpu/virt/virt.c
@@ -87,6 +87,6 @@ static fwts_framework_ops virt_ops = {
.minor_tests = virt_tests
};
-FWTS_REGISTER(virt, &virt_ops, FWTS_TEST_ANYTIME, FWTS_BATCH | FWTS_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 1c0c1ef..a9b46d3 100644
--- a/src/dmi/dmi_decode/dmi_decode.c
+++ b/src/dmi/dmi_decode/dmi_decode.c
@@ -1270,6 +1270,6 @@ static fwts_framework_ops dmi_decode_ops = {
.minor_tests = dmi_decode_tests
};
-FWTS_REGISTER(dmi_decode, &dmi_decode_ops, FWTS_TEST_ANYTIME, FWTS_BATCH | FWTS_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 151f580..9feec08 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_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 19f9a12..dfd8888 100644
--- a/src/hotkey/hotkey/hotkey.c
+++ b/src/hotkey/hotkey/hotkey.c
@@ -259,6 +259,6 @@ static fwts_framework_ops hotkey_ops = {
.minor_tests = hotkey_tests
};
-FWTS_REGISTER(hotkey, &hotkey_ops, FWTS_TEST_ANYTIME, FWTS_INTERACTIVE | FWTS_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 8eeedbb..34d329a 100644
--- a/src/hpet/hpet_check/hpet_check.c
+++ b/src/hpet/hpet_check/hpet_check.c
@@ -276,6 +276,6 @@ static fwts_framework_ops hpet_check_ops = {
};
FWTS_REGISTER(hpet_check, &hpet_check_ops, FWTS_TEST_ANYTIME,
- FWTS_BATCH | FWTS_ROOT_PRIV);
+ FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
#endif
diff --git a/src/kernel/oops/oops.c b/src/kernel/oops/oops.c
index 2119656..5e16ce9 100644
--- a/src/kernel/oops/oops.c
+++ b/src/kernel/oops/oops.c
@@ -77,4 +77,4 @@ static fwts_framework_ops oops_ops = {
.minor_tests = oops_tests
};
-FWTS_REGISTER(oops, &oops_ops, FWTS_TEST_EARLY, FWTS_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 37ed5b5..14f24a2 100644
--- a/src/kernel/version/version.c
+++ b/src/kernel/version/version.c
@@ -81,4 +81,4 @@ static fwts_framework_ops version_ops = {
.minor_tests = version_tests
};
-FWTS_REGISTER(version, &version_ops, FWTS_TEST_FIRST, FWTS_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 ad490c7..bca1150 100644
--- a/src/lib/include/fwts_framework.h
+++ b/src/lib/include/fwts_framework.h
@@ -30,33 +30,33 @@
#define FWTS_FRAMEWORK_MAGIC 0x2af61aec
typedef enum {
- FWTS_FRAMEWORK_FLAGS_DEFAULT = 0x00000000,
- FWTS_FRAMEWORK_FLAGS_STDOUT_SUMMARY = 0x00000001,
- FWTS_FRAMEWORK_FLAGS_SHOW_PROGRESS = 0x00000002,
- FWTS_FRAMEWORK_FLAGS_FORCE_CLEAN = 0x00000004,
- FWTS_FRAMEWORK_FLAGS_SHOW_TESTS = 0x00000008,
- FWTS_FRAMEWORK_FLAGS_SHOW_PROGRESS_DIALOG = 0x00000010,
- FWTS_FRAMEWORK_FLAGS_BATCH = 0x00001000,
- FWTS_FRAMEWORK_FLAGS_INTERACTIVE = 0x00002000,
- FWTS_FRAMEWORK_FLAGS_BATCH_EXPERIMENTAL = 0x00004000,
- FWTS_FRAMEWORK_FLAGS_INTERACTIVE_EXPERIMENTAL = 0x00008000,
- FWTS_FRAMEWORK_FLAGS_POWER_STATES = 0x00010000,
- FWTS_FRAMEWORK_FLAGS_ROOT_PRIV = 0x00020000,
- FWTS_FRAMEWORK_FLAGS_UNSAFE = 0x00040000,
- FWTS_FRAMEWORK_FLAGS_TEST_BIOS = 0x01000000,
- FWTS_FRAMEWORK_FLAGS_TEST_UEFI = 0x02000000,
- FWTS_FRAMEWORK_FLAGS_TEST_ACPI = 0x04000000,
- FWTS_FRAMEWORK_FLAGS_UTILS = 0x08000000,
- FWTS_FRAMEWORK_FLAGS_QUIET = 0x10000000,
- FWTS_FRAMEWORK_FLAGS_LP_TAGS = 0x20000000,
- FWTS_FRAMEWORK_FLAGS_LP_TAGS_LOG = 0x40000000,
- FWTS_FRAMEWORK_FLAGS_SHOW_TESTS_FULL = 0x80000000,
+ FWTS_FLAG_DEFAULT = 0x00000000,
+ FWTS_FLAG_STDOUT_SUMMARY = 0x00000001,
+ FWTS_FLAG_SHOW_PROGRESS = 0x00000002,
+ FWTS_FLAG_FORCE_CLEAN = 0x00000004,
+ FWTS_FLAG_SHOW_TESTS = 0x00000008,
+ FWTS_FLAG_SHOW_PROGRESS_DIALOG = 0x00000010,
+ FWTS_FLAG_BATCH = 0x00001000,
+ FWTS_FLAG_INTERACTIVE = 0x00002000,
+ FWTS_FLAG_BATCH_EXPERIMENTAL = 0x00004000,
+ FWTS_FLAG_INTERACTIVE_EXPERIMENTAL = 0x00008000,
+ FWTS_FLAG_POWER_STATES = 0x00010000,
+ FWTS_FLAG_ROOT_PRIV = 0x00020000,
+ FWTS_FLAG_UNSAFE = 0x00040000,
+ FWTS_FLAG_TEST_BIOS = 0x01000000,
+ FWTS_FLAG_TEST_UEFI = 0x02000000,
+ FWTS_FLAG_TEST_ACPI = 0x04000000,
+ FWTS_FLAG_UTILS = 0x08000000,
+ FWTS_FLAG_QUIET = 0x10000000,
+ FWTS_FLAG_LP_TAGS = 0x20000000,
+ FWTS_FLAG_LP_TAGS_LOG = 0x40000000,
+ FWTS_FLAG_SHOW_TESTS_FULL = 0x80000000,
} fwts_framework_flags;
-#define FWTS_FRAMEWORK_FLAGS_TEST_MASK \
- (FWTS_FRAMEWORK_FLAGS_TEST_BIOS | \
- FWTS_FRAMEWORK_FLAGS_TEST_UEFI | \
- FWTS_FRAMEWORK_FLAGS_TEST_ACPI)
+#define FWTS_FLAG_TEST_MASK \
+ (FWTS_FLAG_TEST_BIOS | \
+ FWTS_FLAG_TEST_UEFI | \
+ FWTS_FLAG_TEST_ACPI)
/*
* Test results
@@ -229,22 +229,9 @@ static inline int fwts_tests_passed(const fwts_framework *fw)
/*
* Batch (run w/o interaction) or interactive (requires user interaction) flags
*/
-#define FWTS_BATCH FWTS_FRAMEWORK_FLAGS_BATCH
-#define FWTS_INTERACTIVE FWTS_FRAMEWORK_FLAGS_INTERACTIVE
-#define FWTS_BATCH_EXPERIMENTAL FWTS_FRAMEWORK_FLAGS_BATCH_EXPERIMENTAL
-#define FWTS_INTERACTIVE_EXPERIMENTAL FWTS_FRAMEWORK_FLAGS_INTERACTIVE_EXPERIMENTAL
-#define FWTS_POWER_STATES FWTS_FRAMEWORK_FLAGS_POWER_STATES
-#define FWTS_UTILS FWTS_FRAMEWORK_FLAGS_UTILS
-#define FWTS_ROOT_PRIV FWTS_FRAMEWORK_FLAGS_ROOT_PRIV
-#define FWTS_UNSAFE FWTS_FRAMEWORK_FLAGS_UNSAFE
-
-#define FWTS_TEST_BIOS FWTS_FRAMEWORK_FLAGS_TEST_BIOS
-#define FWTS_TEST_UEFI FWTS_FRAMEWORK_FLAGS_TEST_UEFI
-#define FWTS_TEST_ACPI FWTS_FRAMEWORK_FLAGS_TEST_ACPI
-
#define FWTS_TEST_INTERACTIVE(flags) \
- (flags & (FWTS_FRAMEWORK_FLAGS_INTERACTIVE | \
- FWTS_FRAMEWORK_FLAGS_INTERACTIVE_EXPERIMENTAL))
+ (flags & (FWTS_FLAG_INTERACTIVE | \
+ FWTS_FLAG_INTERACTIVE_EXPERIMENTAL))
#define FWTS_REGISTER(name, ops, priority, flags) \
\
diff --git a/src/lib/src/fwts_framework.c b/src/lib/src/fwts_framework.c
index 1ad3d0d..30645b6 100644
--- a/src/lib/src/fwts_framework.c
+++ b/src/lib/src/fwts_framework.c
@@ -31,14 +31,14 @@
/* Suffix ".log", ".xml", etc gets automatically appended */
#define RESULTS_LOG "results"
-#define FWTS_RUN_ALL_FLAGS \
- (FWTS_BATCH | \
- FWTS_INTERACTIVE | \
- FWTS_BATCH_EXPERIMENTAL | \
- FWTS_INTERACTIVE_EXPERIMENTAL |\
- FWTS_POWER_STATES | \
- FWTS_UTILS | \
- FWTS_UNSAFE)
+#define FWTS_FLAG_RUN_ALL \
+ (FWTS_FLAG_BATCH | \
+ FWTS_FLAG_INTERACTIVE | \
+ FWTS_FLAG_BATCH_EXPERIMENTAL | \
+ FWTS_FLAG_INTERACTIVE_EXPERIMENTAL |\
+ FWTS_FLAG_POWER_STATES | \
+ FWTS_FLAG_UTILS | \
+ FWTS_FLAG_UNSAFE)
#define FWTS_ARGS_WIDTH 28
#define FWTS_MIN_TTY_WIDTH 50
@@ -124,9 +124,9 @@ void fwts_framework_test_add(const char *name,
{
fwts_framework_test *new_test;
- if (flags & ~(FWTS_RUN_ALL_FLAGS | FWTS_ROOT_PRIV)) {
- fprintf(stderr, "Test %s flags must be FWTS_BATCH, FWTS_INTERACTIVE, FWTS_BATCH_EXPERIMENTAL, \n"
- "FWTS_INTERACTIVE_EXPERIMENTAL or FWTS_POWER_STATES, got %x\n", name, flags);
+ if (flags & ~(FWTS_FLAG_RUN_ALL | FWTS_FLAG_ROOT_PRIV)) {
+ fprintf(stderr, "Test %s flags must be a bit field in 0x%x, got %x\n",
+ name, FWTS_FLAG_RUN_ALL, flags);
exit(EXIT_FAILURE);
}
@@ -226,13 +226,13 @@ static void fwts_framework_show_tests(fwts_framework *fw, bool full)
} fwts_categories;
static fwts_categories categories[] = {
- { "Batch", FWTS_BATCH },
- { "Interactive", FWTS_INTERACTIVE },
- { "Batch Experimental", FWTS_BATCH_EXPERIMENTAL },
- { "Interactive Experimental", FWTS_INTERACTIVE_EXPERIMENTAL },
- { "Power States", FWTS_POWER_STATES },
- { "Utilities", FWTS_UTILS },
- { "Unsafe", FWTS_UNSAFE },
+ { "Batch", FWTS_FLAG_BATCH },
+ { "Interactive", FWTS_FLAG_INTERACTIVE },
+ { "Batch Experimental", FWTS_FLAG_BATCH_EXPERIMENTAL },
+ { "Interactive Experimental", FWTS_FLAG_INTERACTIVE_EXPERIMENTAL },
+ { "Power States", FWTS_FLAG_POWER_STATES },
+ { "Utilities", FWTS_FLAG_UTILS },
+ { "Unsafe", FWTS_FLAG_UNSAFE },
{ NULL, 0 },
};
@@ -242,12 +242,12 @@ static void fwts_framework_show_tests(fwts_framework *fw, bool full)
/* If no category flags are set, or category matches user requested
category go and dump name and purpose of tests */
- if (((fw->flags & FWTS_RUN_ALL_FLAGS) == 0) ||
- ((fw->flags & FWTS_RUN_ALL_FLAGS) & categories[i].flag)) {
+ if (((fw->flags & FWTS_FLAG_RUN_ALL) == 0) ||
+ ((fw->flags & FWTS_FLAG_RUN_ALL) & categories[i].flag)) {
fwts_list_init(&sorted);
fwts_list_foreach(item, &fwts_framework_test_list) {
test = fwts_list_data(fwts_framework_test *, item);
- if ((test->flags & FWTS_RUN_ALL_FLAGS) == categories[i].flag)
+ if ((test->flags & FWTS_FLAG_RUN_ALL) == categories[i].flag)
fwts_list_add_ordered(&sorted, test,
fwts_framework_compare_test_name);
}
@@ -257,7 +257,7 @@ static void fwts_framework_show_tests(fwts_framework *fw, bool full)
printf("\n");
need_nl = 1;
printf("%s%s:\n", categories[i].title,
- categories[i].flag & FWTS_UTILS ? "" : " tests");
+ categories[i].flag & FWTS_FLAG_UTILS ? "" : " tests");
fwts_list_foreach(item, &sorted) {
test = fwts_list_data(fwts_framework_test *, item);
@@ -387,7 +387,7 @@ void fwts_framework_minor_test_progress(fwts_framework *fw, const int percent, c
}
/* Output for the dialog tool, dialog --title "fwts" --gauge "" 12 80 0 */
- if (fw->flags & FWTS_FRAMEWORK_FLAGS_SHOW_PROGRESS_DIALOG) {
+ if (fw->flags & FWTS_FLAG_SHOW_PROGRESS_DIALOG) {
char buffer[128];
fwts_framework_format_results(buffer, sizeof(buffer), &fw->total, true);
@@ -425,7 +425,7 @@ static int fwts_framework_test_summary(fwts_framework *fw)
fwts_log_summary(fw, "%s.", buffer);
fwts_framework_underline(fw,'=');
- if (fw->flags & FWTS_FRAMEWORK_FLAGS_STDOUT_SUMMARY) {
+ if (fw->flags & FWTS_FLAG_STDOUT_SUMMARY) {
if (results->aborted > 0)
printf("%s\n", fwts_log_field_to_str_upper(LOG_ABORTED));
else if (results->skipped > 0)
@@ -448,7 +448,7 @@ static int fwts_framework_test_summary(fwts_framework *fw)
printf("%s\n", fwts_log_field_to_str_upper(LOG_PASSED));
}
- if (!(fw->flags & FWTS_FRAMEWORK_FLAGS_LP_TAGS))
+ if (!(fw->flags & FWTS_FLAG_LP_TAGS))
fwts_log_newline(fw->results);
return FWTS_OK;
@@ -484,11 +484,11 @@ static int fwts_framework_run_test(fwts_framework *fw, const int num_tests, fwts
fwts_log_set_owner(fw->results, test->name);
fw->current_minor_test_num = 1;
- fw->show_progress = (fw->flags & FWTS_FRAMEWORK_FLAGS_SHOW_PROGRESS) &&
+ fw->show_progress = (fw->flags & FWTS_FLAG_SHOW_PROGRESS) &&
(FWTS_TEST_INTERACTIVE(test->flags) == 0);
/* Not a utility test?, then we require a test summary at end of the test run */
- if (!(test->flags & FWTS_UTILS))
+ if (!(test->flags & FWTS_FLAG_UTILS))
fw->print_summary = 1;
if (test->ops->description) {
@@ -503,7 +503,7 @@ static int fwts_framework_run_test(fwts_framework *fw, const int num_tests, fwts
fwts_framework_minor_test_progress(fw, 0, "");
- if ((test->flags & FWTS_ROOT_PRIV) &&
+ if ((test->flags & FWTS_FLAG_ROOT_PRIV) &&
(fwts_check_root_euid(fw, true) != FWTS_OK)) {
fwts_log_error(fw, "Aborted test, insufficient privilege.");
fw->current_major_test->results.aborted += test->ops->total_tests;
@@ -593,7 +593,7 @@ static int fwts_framework_run_test(fwts_framework *fw, const int num_tests, fwts
if (test->ops->deinit)
test->ops->deinit(fw);
- if (fw->flags & FWTS_FRAMEWORK_FLAGS_LP_TAGS_LOG) {
+ if (fw->flags & FWTS_FLAG_LP_TAGS_LOG) {
fwts_log_section_begin(fw->results, "tags");
fwts_tag_report(fw, LOG_TAG, &fw->test_taglist);
fwts_log_section_end(fw->results);
@@ -602,7 +602,7 @@ static int fwts_framework_run_test(fwts_framework *fw, const int num_tests, fwts
done:
fwts_list_free_items(&fw->test_taglist, free);
- if (!(test->flags & FWTS_UTILS)) {
+ if (!(test->flags & FWTS_FLAG_UTILS)) {
fwts_log_section_begin(fw->results, "results");
fwts_framework_test_summary(fw);
fwts_log_section_end(fw->results); /* results */
@@ -793,7 +793,7 @@ static void fwts_framework_heading_info(fwts_framework *fw, fwts_list *tests_to_
fwts_log_info(fw, "Running tests: %s.",
fwts_list_len(tests_to_run) == 0 ? "None" : tests);
- if (!(fw->flags & FWTS_FRAMEWORK_FLAGS_LP_TAGS))
+ if (!(fw->flags & FWTS_FLAG_LP_TAGS))
fwts_log_newline(fw->results);
free(tests);
}
@@ -875,7 +875,7 @@ int fwts_framework_options_handler(fwts_framework *fw, int argc, char * const ar
case 0:
switch (long_index) {
case 0: /* --stdout-summary */
- fw->flags |= FWTS_FRAMEWORK_FLAGS_STDOUT_SUMMARY;
+ fw->flags |= FWTS_FLAG_STDOUT_SUMMARY;
break;
case 1: /* --help */
fwts_framework_syntax(argv);
@@ -898,12 +898,12 @@ int fwts_framework_options_handler(fwts_framework *fw, int argc, char * const ar
break;
case 7: /* --show-progress */
fw->flags = (fw->flags &
- ~(FWTS_FRAMEWORK_FLAGS_QUIET |
- FWTS_FRAMEWORK_FLAGS_SHOW_PROGRESS_DIALOG))
- | FWTS_FRAMEWORK_FLAGS_SHOW_PROGRESS;
+ ~(FWTS_FLAG_QUIET |
+ FWTS_FLAG_SHOW_PROGRESS_DIALOG))
+ | FWTS_FLAG_SHOW_PROGRESS;
break;
case 8: /* --show-tests */
- fw->flags |= FWTS_FRAMEWORK_FLAGS_SHOW_TESTS;
+ fw->flags |= FWTS_FLAG_SHOW_TESTS;
break;
case 9: /* --klog */
fwts_framework_strdup(&fw->klog, optarg);
@@ -915,13 +915,13 @@ int fwts_framework_options_handler(fwts_framework *fw, int argc, char * const ar
fwts_framework_strdup(&fw->lspci, optarg);
break;
case 12: /* --batch */
- fw->flags |= FWTS_FRAMEWORK_FLAGS_BATCH;
+ fw->flags |= FWTS_FLAG_BATCH;
break;
case 13: /* --interactive */
- fw->flags |= FWTS_FRAMEWORK_FLAGS_INTERACTIVE;
+ fw->flags |= FWTS_FLAG_INTERACTIVE;
break;
case 14: /* --force-clean */
- fw->flags |= FWTS_FRAMEWORK_FLAGS_FORCE_CLEAN;
+ fw->flags |= FWTS_FLAG_FORCE_CLEAN;
break;
case 15: /* --version */
fwts_framework_show_version(stdout, argv[0]);
@@ -933,22 +933,22 @@ int fwts_framework_options_handler(fwts_framework *fw, int argc, char * const ar
fwts_framework_strdup(&fw->acpi_table_path, optarg);
break;
case 18: /* --batch-experimental */
- fw->flags |= FWTS_FRAMEWORK_FLAGS_BATCH_EXPERIMENTAL;
+ fw->flags |= FWTS_FLAG_BATCH_EXPERIMENTAL;
break;
case 19: /* --interactive-experimental */
- fw->flags |= FWTS_FRAMEWORK_FLAGS_INTERACTIVE_EXPERIMENTAL;
+ fw->flags |= FWTS_FLAG_INTERACTIVE_EXPERIMENTAL;
break;
case 20: /* --power-states */
- fw->flags |= FWTS_FRAMEWORK_FLAGS_POWER_STATES;
+ fw->flags |= FWTS_FLAG_POWER_STATES;
break;
case 21: /* --all */
- fw->flags |= FWTS_RUN_ALL_FLAGS;
+ fw->flags |= FWTS_FLAG_RUN_ALL;
break;
case 22: /* --show-progress-dialog */
fw->flags = (fw->flags &
- ~(FWTS_FRAMEWORK_FLAGS_QUIET |
- FWTS_FRAMEWORK_FLAGS_SHOW_PROGRESS))
- | FWTS_FRAMEWORK_FLAGS_SHOW_PROGRESS_DIALOG;
+ ~(FWTS_FLAG_QUIET |
+ FWTS_FLAG_SHOW_PROGRESS))
+ | FWTS_FLAG_SHOW_PROGRESS_DIALOG;
break;
case 23: /* --skip-test */
if (fwts_framework_skip_test_parse(fw, optarg, &tests_to_skip) != FWTS_OK)
@@ -956,29 +956,29 @@ int fwts_framework_options_handler(fwts_framework *fw, int argc, char * const ar
break;
case 24: /* --quiet */
fw->flags = (fw->flags &
- ~(FWTS_FRAMEWORK_FLAGS_SHOW_PROGRESS |
- FWTS_FRAMEWORK_FLAGS_SHOW_PROGRESS_DIALOG))
- | FWTS_FRAMEWORK_FLAGS_QUIET;
+ ~(FWTS_FLAG_SHOW_PROGRESS |
+ FWTS_FLAG_SHOW_PROGRESS_DIALOG))
+ | FWTS_FLAG_QUIET;
break;
case 25: /* --dumpfile */
fwts_framework_strdup(&fw->acpi_table_acpidump_file, optarg);
break;
case 26: /* --lp-tags */
- fw->flags |= FWTS_FRAMEWORK_FLAGS_LP_TAGS;
+ fw->flags |= FWTS_FLAG_LP_TAGS;
fwts_log_filter_unset_field(~0);
fwts_log_filter_set_field(LOG_TAG);
break;
case 27: /* --show-tests-full */
- fw->flags |= FWTS_FRAMEWORK_FLAGS_SHOW_TESTS_FULL;
+ fw->flags |= FWTS_FLAG_SHOW_TESTS_FULL;
break;
case 28: /* --utils */
- fw->flags |= FWTS_FRAMEWORK_FLAGS_UTILS;
+ fw->flags |= FWTS_FLAG_UTILS;
break;
case 29: /* --json-data-path */
fwts_framework_strdup(&fw->json_data_path, optarg);
break;
case 30: /* --lp-tags-log */
- fw->flags |= FWTS_FRAMEWORK_FLAGS_LP_TAGS_LOG;
+ fw->flags |= FWTS_FLAG_LP_TAGS_LOG;
break;
case 31: /* --disassemble-aml */
fwts_iasl_disassemble_all_to_file(fw);
@@ -988,34 +988,34 @@ int fwts_framework_options_handler(fwts_framework *fw, int argc, char * const ar
return FWTS_ERROR;
break;
case 33: /* --unsafe */
- fw->flags |= FWTS_FRAMEWORK_FLAGS_UNSAFE;
+ fw->flags |= FWTS_FLAG_UNSAFE;
break;
}
break;
case 'a': /* --all */
- fw->flags |= FWTS_RUN_ALL_FLAGS;
+ fw->flags |= FWTS_FLAG_RUN_ALL;
break;
case 'b': /* --batch */
- fw->flags |= FWTS_FRAMEWORK_FLAGS_BATCH;
+ fw->flags |= FWTS_FLAG_BATCH;
break;
case 'd': /* --dump */
fwts_dump_info(fw, NULL);
return FWTS_COMPLETE;
case 'D': /* --show-progress-dialog */
fw->flags = (fw->flags &
- ~(FWTS_FRAMEWORK_FLAGS_QUIET |
- FWTS_FRAMEWORK_FLAGS_SHOW_PROGRESS))
- | FWTS_FRAMEWORK_FLAGS_SHOW_PROGRESS_DIALOG;
+ ~(FWTS_FLAG_QUIET |
+ FWTS_FLAG_SHOW_PROGRESS))
+ | FWTS_FLAG_SHOW_PROGRESS_DIALOG;
break;
case 'f':
- fw->flags |= FWTS_FRAMEWORK_FLAGS_FORCE_CLEAN;
+ fw->flags |= FWTS_FLAG_FORCE_CLEAN;
break;
case 'h':
case '?':
fwts_framework_syntax(argv);
return FWTS_COMPLETE;
case 'i': /* --interactive */
- fw->flags |= FWTS_FRAMEWORK_FLAGS_INTERACTIVE;
+ fw->flags |= FWTS_FLAG_INTERACTIVE;
break;
case 'j': /* --json-data-path */
fwts_framework_strdup(&fw->json_data_path, optarg);
@@ -1024,28 +1024,28 @@ int fwts_framework_options_handler(fwts_framework *fw, int argc, char * const ar
fwts_framework_strdup(&fw->klog, optarg);
break;
case 'l': /* --lp-flags */
- fw->flags |= FWTS_FRAMEWORK_FLAGS_LP_TAGS;
+ fw->flags |= FWTS_FLAG_LP_TAGS;
break;
case 'p': /* --show-progress */
fw->flags = (fw->flags &
- ~(FWTS_FRAMEWORK_FLAGS_QUIET |
- FWTS_FRAMEWORK_FLAGS_SHOW_PROGRESS_DIALOG))
- | FWTS_FRAMEWORK_FLAGS_SHOW_PROGRESS;
+ ~(FWTS_FLAG_QUIET |
+ FWTS_FLAG_SHOW_PROGRESS_DIALOG))
+ | FWTS_FLAG_SHOW_PROGRESS;
break;
case 'P': /* --power-states */
- fw->flags |= FWTS_FRAMEWORK_FLAGS_POWER_STATES;
+ fw->flags |= FWTS_FLAG_POWER_STATES;
break;
case 'q': /* --quiet */
fw->flags = (fw->flags &
- ~(FWTS_FRAMEWORK_FLAGS_SHOW_PROGRESS |
- FWTS_FRAMEWORK_FLAGS_SHOW_PROGRESS_DIALOG))
- | FWTS_FRAMEWORK_FLAGS_QUIET;
+ ~(FWTS_FLAG_SHOW_PROGRESS |
+ FWTS_FLAG_SHOW_PROGRESS_DIALOG))
+ | FWTS_FLAG_QUIET;
break;
case 'r': /* --results-output */
fwts_framework_strdup(&fw->results_logname, optarg);
break;
case 's': /* --show-tests */
- fw->flags |= FWTS_FRAMEWORK_FLAGS_SHOW_TESTS;
+ fw->flags |= FWTS_FLAG_SHOW_TESTS;
break;
case 'S': /* --skip-test */
if (fwts_framework_skip_test_parse(fw, optarg, &tests_to_skip) != FWTS_OK)
@@ -1055,10 +1055,10 @@ int fwts_framework_options_handler(fwts_framework *fw, int argc, char * const ar
fwts_framework_strdup(&fw->acpi_table_path, optarg);
break;
case 'u': /* --utils */
- fw->flags |= FWTS_FRAMEWORK_FLAGS_UTILS;
+ fw->flags |= FWTS_FLAG_UTILS;
break;
case 'U': /* --unsafe */
- fw->flags |= FWTS_FRAMEWORK_FLAGS_UNSAFE;
+ fw->flags |= FWTS_FLAG_UNSAFE;
break;
case 'v': /* --version */
fwts_framework_show_version(stdout, argv[0]);
@@ -1093,8 +1093,8 @@ int fwts_framework_args(const int argc, char **argv)
fw->firmware_type = fwts_firmware_detect();
fw->magic = FWTS_FRAMEWORK_MAGIC;
- fw->flags = FWTS_FRAMEWORK_FLAGS_DEFAULT |
- FWTS_FRAMEWORK_FLAGS_SHOW_PROGRESS;
+ fw->flags = FWTS_FLAG_DEFAULT |
+ FWTS_FLAG_SHOW_PROGRESS;
fw->log_type = LOG_TYPE_PLAINTEXT;
fwts_list_init(&fw->total_taglist);
@@ -1122,22 +1122,22 @@ int fwts_framework_args(const int argc, char **argv)
if (!strcmp(argv[i], "-")) {
fwts_framework_strdup(&fw->results_logname, "stdout");
fw->flags = (fw->flags &
- ~(FWTS_FRAMEWORK_FLAGS_SHOW_PROGRESS |
- FWTS_FRAMEWORK_FLAGS_SHOW_PROGRESS_DIALOG))
- | FWTS_FRAMEWORK_FLAGS_QUIET;
+ ~(FWTS_FLAG_SHOW_PROGRESS |
+ FWTS_FLAG_SHOW_PROGRESS_DIALOG))
+ | FWTS_FLAG_QUIET;
break;
}
- if (fw->flags & FWTS_FRAMEWORK_FLAGS_SHOW_TESTS) {
+ if (fw->flags & FWTS_FLAG_SHOW_TESTS) {
fwts_framework_show_tests(fw, false);
goto tidy_close;
}
- if (fw->flags & FWTS_FRAMEWORK_FLAGS_SHOW_TESTS_FULL) {
+ if (fw->flags & FWTS_FLAG_SHOW_TESTS_FULL) {
fwts_framework_show_tests(fw, true);
goto tidy_close;
}
- if ((fw->flags & FWTS_RUN_ALL_FLAGS) == 0)
- fw->flags |= FWTS_FRAMEWORK_FLAGS_BATCH;
+ if ((fw->flags & FWTS_FLAG_RUN_ALL) == 0)
+ fw->flags |= FWTS_FLAG_BATCH;
if ((fw->lspci == NULL) || (fw->results_logname == NULL)) {
ret = FWTS_ERROR;
fprintf(stderr, "%s: Memory allocation failure.", argv[0]);
@@ -1157,7 +1157,7 @@ int fwts_framework_args(const int argc, char **argv)
/* Results log */
if ((fw->results = fwts_log_open("fwts",
fw->results_logname,
- fw->flags & FWTS_FRAMEWORK_FLAGS_FORCE_CLEAN ? "w" : "a",
+ fw->flags & FWTS_FLAG_FORCE_CLEAN ? "w" : "a",
fw->log_type)) == NULL) {
ret = FWTS_ERROR;
fprintf(stderr, "%s: Cannot open results log '%s'.\n", argv[0], fw->results_logname);
@@ -1187,13 +1187,13 @@ int fwts_framework_args(const int argc, char **argv)
fwts_list_link *item;
fwts_list_foreach(item, &fwts_framework_test_list) {
fwts_framework_test *test = fwts_list_data(fwts_framework_test*, item);
- if (fw->flags & test->flags & FWTS_RUN_ALL_FLAGS)
+ if (fw->flags & test->flags & FWTS_FLAG_RUN_ALL)
if (fwts_framework_skip_test(&tests_to_skip, test) == NULL)
fwts_list_append(&tests_to_run, test);
}
}
- if (!(fw->flags & FWTS_FRAMEWORK_FLAGS_QUIET)) {
+ if (!(fw->flags & FWTS_FLAG_QUIET)) {
char *filenames = fwts_log_get_filenames(fw->results_logname, fw->log_type);
if (filenames) {
@@ -1216,7 +1216,7 @@ int fwts_framework_args(const int argc, char **argv)
fwts_log_section_begin(fw->results, "summary");
fwts_log_set_owner(fw->results, "summary");
fwts_log_nl(fw);
- if (fw->flags & FWTS_FRAMEWORK_FLAGS_LP_TAGS_LOG)
+ if (fw->flags & FWTS_FLAG_LP_TAGS_LOG)
fwts_tag_report(fw, LOG_SUMMARY, &fw->total_taglist);
fwts_framework_total_summary(fw);
fwts_log_nl(fw);
@@ -1224,7 +1224,7 @@ int fwts_framework_args(const int argc, char **argv)
fwts_log_section_end(fw->results);
}
- if (fw->flags & FWTS_FRAMEWORK_FLAGS_LP_TAGS)
+ if (fw->flags & FWTS_FLAG_LP_TAGS)
fwts_tag_report(fw, LOG_TAG | LOG_NO_FIELDS, &fw->total_taglist);
tidy:
diff --git a/src/pci/aspm/aspm.c b/src/pci/aspm/aspm.c
index e85be9a..90452c2 100644
--- a/src/pci/aspm/aspm.c
+++ b/src/pci/aspm/aspm.c
@@ -329,4 +329,4 @@ static fwts_framework_ops aspm_ops = {
.minor_tests = aspm_tests
};
-FWTS_REGISTER(aspm, &aspm_ops, FWTS_TEST_ANYTIME, FWTS_BATCH | FWTS_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 61682b5..140a9ae 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_BATCH | FWTS_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 1a9a0e5..cdf82ce 100644
--- a/src/pci/maxreadreq/maxreadreq.c
+++ b/src/pci/maxreadreq/maxreadreq.c
@@ -146,4 +146,4 @@ static fwts_framework_ops maxreadreq_ops = {
.minor_tests = maxreadreq_tests
};
-FWTS_REGISTER(maxreadreq, &maxreadreq_ops, FWTS_TEST_ANYTIME, FWTS_BATCH | FWTS_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 8c3d433..c6f614d 100644
--- a/src/uefi/csm/csm.c
+++ b/src/uefi/csm/csm.c
@@ -111,6 +111,6 @@ static fwts_framework_ops csm_ops = {
.minor_tests = csm_tests
};
-FWTS_REGISTER(csm, &csm_ops, FWTS_TEST_ANYTIME, FWTS_BATCH | FWTS_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 1f71107..213cdce 100644
--- a/src/uefi/uefidump/uefidump.c
+++ b/src/uefi/uefidump/uefidump.c
@@ -625,4 +625,4 @@ static fwts_framework_ops uefidump_ops = {
.minor_tests = uefidump_tests
};
-FWTS_REGISTER(uefidump, &uefidump_ops, FWTS_TEST_ANYTIME, FWTS_UTILS | FWTS_ROOT_PRIV);
+FWTS_REGISTER(uefidump, &uefidump_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV);
--
1.7.10.4
More information about the fwts-devel
mailing list