diff mbox

[v3] acpi: only run ACPI tests if we have ACPI

Message ID 1406192125.383598.397807659656.1.gpush@pablo
State Deferred
Headers show

Commit Message

Jeremy Kerr July 24, 2014, 8:55 a.m. UTC 
We only want to run ACPI tests if the firmware has ACPI, so add
the relevant feature bits to ACPI tests run in batch mode.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

---
 src/acpi/acpitables/acpitables.c   |    3 ++-
 src/acpi/checksum/checksum.c       |    3 ++-
 src/acpi/method/method.c           |    3 ++-
 src/acpi/syntaxcheck/syntaxcheck.c |    3 ++-
 src/pci/aspm/aspm.c                |    3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

Comments

Keng-Yu Lin Aug. 5, 2014, 8:34 a.m. UTC | #1 
On Thu, Jul 24, 2014 at 4:55 PM, Jeremy Kerr <jk@ozlabs.org> wrote:
> We only want to run ACPI tests if the firmware has ACPI, so add
> the relevant feature bits to ACPI tests run in batch mode.
>
> Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
>
> ---
>  src/acpi/acpitables/acpitables.c   |    3 ++-
>  src/acpi/checksum/checksum.c       |    3 ++-
>  src/acpi/method/method.c           |    3 ++-
>  src/acpi/syntaxcheck/syntaxcheck.c |    3 ++-
>  src/pci/aspm/aspm.c                |    3 ++-
>  5 files changed, 10 insertions(+), 5 deletions(-)
>
> diff --git a/src/acpi/acpitables/acpitables.c b/src/acpi/acpitables/acpitables.c
> index 439df2a..999ef7d 100644
> --- a/src/acpi/acpitables/acpitables.c
> +++ b/src/acpi/acpitables/acpitables.c
> @@ -616,4 +616,5 @@ 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_FEATURES("acpitables", &acpi_table_check_ops, FWTS_TEST_ANYTIME,
> +               FWTS_FLAG_BATCH, FWTS_FW_FEATURE_ACPI);
> diff --git a/src/acpi/checksum/checksum.c b/src/acpi/checksum/checksum.c
> index bac266d..277814f 100644
> --- a/src/acpi/checksum/checksum.c
> +++ b/src/acpi/checksum/checksum.c
> @@ -155,4 +155,5 @@ static fwts_framework_ops checksum_ops = {
>         .minor_tests = checksum_tests
>  };
>
> -FWTS_REGISTER("checksum", &checksum_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
> +FWTS_REGISTER_FEATURES("checksum", &checksum_ops, FWTS_TEST_ANYTIME,
> +               FWTS_FLAG_BATCH, FWTS_FW_FEATURE_ACPI);
> diff --git a/src/acpi/method/method.c b/src/acpi/method/method.c
> index 9b789cf..8e4a064 100644
> --- a/src/acpi/method/method.c
> +++ b/src/acpi/method/method.c
> @@ -5140,4 +5140,5 @@ static fwts_framework_ops method_ops = {
>         .minor_tests = method_tests
>  };
>
> -FWTS_REGISTER("method", &method_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
> +FWTS_REGISTER_FEATURES("method", &method_ops, FWTS_TEST_ANYTIME,
> +               FWTS_FLAG_BATCH, FWTS_FW_FEATURE_ACPI);
> diff --git a/src/acpi/syntaxcheck/syntaxcheck.c b/src/acpi/syntaxcheck/syntaxcheck.c
> index 504e5c6..7137aab 100644
> --- a/src/acpi/syntaxcheck/syntaxcheck.c
> +++ b/src/acpi/syntaxcheck/syntaxcheck.c
> @@ -623,4 +623,5 @@ static fwts_framework_ops syntaxcheck_ops = {
>         .minor_tests = syntaxcheck_tests
>  };
>
> -FWTS_REGISTER("syntaxcheck", &syntaxcheck_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
> +FWTS_REGISTER_FEATURES("syntaxcheck", &syntaxcheck_ops, FWTS_TEST_ANYTIME,
> +               FWTS_FLAG_BATCH, FWTS_FW_FEATURE_ACPI);
> diff --git a/src/pci/aspm/aspm.c b/src/pci/aspm/aspm.c
> index e798c26..72f4121 100644
> --- a/src/pci/aspm/aspm.c
> +++ b/src/pci/aspm/aspm.c
> @@ -275,4 +275,5 @@ 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_FEATURES("aspm", &aspm_ops, FWTS_TEST_ANYTIME,
> +               FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV, FWTS_FW_FEATURE_ACPI);
>

Acked-by: Keng-Yu Lin <kengyu@canonical.com>
Alex Hung Aug. 6, 2014, 6:56 a.m. UTC | #2 
On 07/24/2014 04:55 PM, Jeremy Kerr wrote:
> We only want to run ACPI tests if the firmware has ACPI, so add
> the relevant feature bits to ACPI tests run in batch mode.
>
> Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
>
> ---
>   src/acpi/acpitables/acpitables.c   |    3 ++-
>   src/acpi/checksum/checksum.c       |    3 ++-
>   src/acpi/method/method.c           |    3 ++-
>   src/acpi/syntaxcheck/syntaxcheck.c |    3 ++-
>   src/pci/aspm/aspm.c                |    3 ++-
>   5 files changed, 10 insertions(+), 5 deletions(-)
>
> diff --git a/src/acpi/acpitables/acpitables.c b/src/acpi/acpitables/acpitables.c
> index 439df2a..999ef7d 100644
> --- a/src/acpi/acpitables/acpitables.c
> +++ b/src/acpi/acpitables/acpitables.c
> @@ -616,4 +616,5 @@ 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_FEATURES("acpitables", &acpi_table_check_ops, FWTS_TEST_ANYTIME,
> +		FWTS_FLAG_BATCH, FWTS_FW_FEATURE_ACPI);
> diff --git a/src/acpi/checksum/checksum.c b/src/acpi/checksum/checksum.c
> index bac266d..277814f 100644
> --- a/src/acpi/checksum/checksum.c
> +++ b/src/acpi/checksum/checksum.c
> @@ -155,4 +155,5 @@ static fwts_framework_ops checksum_ops = {
>   	.minor_tests = checksum_tests
>   };
>
> -FWTS_REGISTER("checksum", &checksum_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
> +FWTS_REGISTER_FEATURES("checksum", &checksum_ops, FWTS_TEST_ANYTIME,
> +		FWTS_FLAG_BATCH, FWTS_FW_FEATURE_ACPI);
> diff --git a/src/acpi/method/method.c b/src/acpi/method/method.c
> index 9b789cf..8e4a064 100644
> --- a/src/acpi/method/method.c
> +++ b/src/acpi/method/method.c
> @@ -5140,4 +5140,5 @@ static fwts_framework_ops method_ops = {
>   	.minor_tests = method_tests
>   };
>
> -FWTS_REGISTER("method", &method_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
> +FWTS_REGISTER_FEATURES("method", &method_ops, FWTS_TEST_ANYTIME,
> +		FWTS_FLAG_BATCH, FWTS_FW_FEATURE_ACPI);
> diff --git a/src/acpi/syntaxcheck/syntaxcheck.c b/src/acpi/syntaxcheck/syntaxcheck.c
> index 504e5c6..7137aab 100644
> --- a/src/acpi/syntaxcheck/syntaxcheck.c
> +++ b/src/acpi/syntaxcheck/syntaxcheck.c
> @@ -623,4 +623,5 @@ static fwts_framework_ops syntaxcheck_ops = {
>   	.minor_tests = syntaxcheck_tests
>   };
>
> -FWTS_REGISTER("syntaxcheck", &syntaxcheck_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
> +FWTS_REGISTER_FEATURES("syntaxcheck", &syntaxcheck_ops, FWTS_TEST_ANYTIME,
> +		FWTS_FLAG_BATCH, FWTS_FW_FEATURE_ACPI);
> diff --git a/src/pci/aspm/aspm.c b/src/pci/aspm/aspm.c
> index e798c26..72f4121 100644
> --- a/src/pci/aspm/aspm.c
> +++ b/src/pci/aspm/aspm.c
> @@ -275,4 +275,5 @@ 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_FEATURES("aspm", &aspm_ops, FWTS_TEST_ANYTIME,
> +		FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV, FWTS_FW_FEATURE_ACPI);
>

Acked-by: Alex Hung <alex.hung@canonical.com>
diff mbox

Patch

diff --git a/src/acpi/acpitables/acpitables.c b/src/acpi/acpitables/acpitables.c
index 439df2a..999ef7d 100644
--- a/src/acpi/acpitables/acpitables.c
+++ b/src/acpi/acpitables/acpitables.c
@@ -616,4 +616,5 @@  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_FEATURES("acpitables", &acpi_table_check_ops, FWTS_TEST_ANYTIME,
+		FWTS_FLAG_BATCH, FWTS_FW_FEATURE_ACPI);
diff --git a/src/acpi/checksum/checksum.c b/src/acpi/checksum/checksum.c
index bac266d..277814f 100644
--- a/src/acpi/checksum/checksum.c
+++ b/src/acpi/checksum/checksum.c
@@ -155,4 +155,5 @@  static fwts_framework_ops checksum_ops = {
 	.minor_tests = checksum_tests
 };
 
-FWTS_REGISTER("checksum", &checksum_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
+FWTS_REGISTER_FEATURES("checksum", &checksum_ops, FWTS_TEST_ANYTIME,
+		FWTS_FLAG_BATCH, FWTS_FW_FEATURE_ACPI);
diff --git a/src/acpi/method/method.c b/src/acpi/method/method.c
index 9b789cf..8e4a064 100644
--- a/src/acpi/method/method.c
+++ b/src/acpi/method/method.c
@@ -5140,4 +5140,5 @@  static fwts_framework_ops method_ops = {
 	.minor_tests = method_tests
 };
 
-FWTS_REGISTER("method", &method_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
+FWTS_REGISTER_FEATURES("method", &method_ops, FWTS_TEST_ANYTIME,
+		FWTS_FLAG_BATCH, FWTS_FW_FEATURE_ACPI);
diff --git a/src/acpi/syntaxcheck/syntaxcheck.c b/src/acpi/syntaxcheck/syntaxcheck.c
index 504e5c6..7137aab 100644
--- a/src/acpi/syntaxcheck/syntaxcheck.c
+++ b/src/acpi/syntaxcheck/syntaxcheck.c
@@ -623,4 +623,5 @@  static fwts_framework_ops syntaxcheck_ops = {
 	.minor_tests = syntaxcheck_tests
 };
 
-FWTS_REGISTER("syntaxcheck", &syntaxcheck_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
+FWTS_REGISTER_FEATURES("syntaxcheck", &syntaxcheck_ops, FWTS_TEST_ANYTIME,
+		FWTS_FLAG_BATCH, FWTS_FW_FEATURE_ACPI);
diff --git a/src/pci/aspm/aspm.c b/src/pci/aspm/aspm.c
index e798c26..72f4121 100644
--- a/src/pci/aspm/aspm.c
+++ b/src/pci/aspm/aspm.c
@@ -275,4 +275,5 @@  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_FEATURES("aspm", &aspm_ops, FWTS_TEST_ANYTIME,
+		FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV, FWTS_FW_FEATURE_ACPI);