[libvirt] [PATCH 4/4] Update cputest test cases for PowerPC CPU models

[Daniel P. Berrange]

On Fri, Oct 10, 2014 at 03:54:28PM +0530, Prerna Saxena wrote:
> 
> >From 67ca1c61d5e1c7de0c2d44e2ef47bc8bba39c159 Mon Sep 17 00:00:00 2001
> From: "Pradipta Kr. Banerjee" <bpradip at in.ibm.com>
> Date: Tue, 7 Oct 2014 13:38:28 +0530
> 
> With reference to the previous update of cpu_map.xml,
> this patch fixes test cases for PowerPC CPUs.
> This also updates a test case for compat mode, introduced previously
> in the series.
> 
> Signed-off-by: Prerna Saxena <prerna at linux.vnet.ibm.com>
> Signed-off-by: Pradipta Kr. Banerjee <bpradip at in.ibm.com>
> Signed-off-by: Li Zhang <zhlcindy at linux.vnet.ibm.com>
> ---
>  tests/cputest.c                                                      | 4 ++--
>  tests/cputestdata/ppc64-baseline-1-result.xml                        | 2 +-
>  tests/cputestdata/ppc64-baseline-incompatible-vendors.xml            | 4 ++--
>  tests/cputestdata/ppc64-baseline-no-vendor-result.xml                | 2 +-
>  tests/cputestdata/ppc64-baseline-no-vendor.xml                       | 2 +-
>  tests/cputestdata/ppc64-exact.xml                                    | 2 +-
>  tests/cputestdata/ppc64-guest-nofallback.xml                         | 2 +-
>  tests/cputestdata/ppc64-guest.xml                                    | 2 +-
>  tests/cputestdata/ppc64-host+guest,ppc_models-result.xml             | 2 +-
>  .../ppc64-host+guest-nofallback,ppc_models,POWER7_v2.1-result.xml    | 5 -----
>  .../ppc64-host+guest-nofallback,ppc_models,power7-result.xml         | 5 +++++
>  tests/cputestdata/ppc64-host.xml                                     | 2 +-
>  tests/cputestdata/ppc64-strict.xml                                   | 2 +-
>  tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.args           | 3 ++-
>  tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.xml            | 2 +-
>  15 files changed, 21 insertions(+), 20 deletions(-)
>  delete mode 100644 tests/cputestdata/ppc64-host+guest-nofallback,ppc_models,POWER7_v2.1-result.xml
>  create mode 100644 tests/cputestdata/ppc64-host+guest-nofallback,ppc_models,power7-result.xml
> 
> diff --git a/tests/cputest.c b/tests/cputest.c
> index a507576..96b9dbf 100644
> --- a/tests/cputest.c
> +++ b/tests/cputest.c
> @@ -496,7 +496,7 @@ cpuTestRun(const char *name, const struct data *data)
>  static const char *model486[]   = { "486" };
>  static const char *nomodel[]    = { "nomodel" };
>  static const char *models[]     = { "qemu64", "core2duo", "Nehalem" };
> -static const char *ppc_models[]     = { "POWER7", "POWER7_v2.1", "POWER8_v1.0"};
> +static const char *ppc_models[]     = { "power6", "power7", "power8"};
>  
>  static int
>  mymain(void)
> @@ -643,7 +643,7 @@ mymain(void)
>                        models, "Penryn", -1);
>  
>      DO_TEST_GUESTDATA("ppc64", "host", "guest", ppc_models, NULL, 0);
> -    DO_TEST_GUESTDATA("ppc64", "host", "guest-nofallback", ppc_models, "POWER7_v2.1", -1);
> +    DO_TEST_GUESTDATA("ppc64", "host", "guest-nofallback", ppc_models, "power7", -1);
>  
>      return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
>  }
> diff --git a/tests/cputestdata/ppc64-baseline-1-result.xml b/tests/cputestdata/ppc64-baseline-1-result.xml
> index cbdd9bc..a330ef6 100644
> --- a/tests/cputestdata/ppc64-baseline-1-result.xml
> +++ b/tests/cputestdata/ppc64-baseline-1-result.xml
> @@ -1,3 +1,3 @@
>  <cpu mode='custom' match='exact'>
> -  <model fallback='allow'>POWER7+_v2.1</model>
> +  <model fallback='allow'>power7</model>
>  </cpu>

Having to update the tests in this way again just shows that you
have broken compatibility with existing guest configs.

Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|