kvm: tests: Sort tests in the Makefile alphabetically

Message ID	20190521171358.158429-1-aaronlewis@google.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <kvm-owner@kernel.org> Date: Tue, 21 May 2019 10:13:58 -0700 Message-Id: <20190521171358.158429-1-aaronlewis@google.com> Mime-Version: 1.0 Subject: [PATCH] kvm: tests: Sort tests in the Makefile alphabetically From: Aaron Lewis <aaronlewis@google.com> To: jmattson@google.com, pshier@google.com, marcorr@google.com, kvm@vger.kernel.org Cc: Aaron Lewis <aaronlewis@google.com> Content-Type: text/plain; charset="UTF-8" Sender: kvm-owner@vger.kernel.org Precedence: bulk
Series	kvm: tests: Sort tests in the Makefile alphabetically \| expand kvm: tests: Sort tests in the Makefile alphabetically

Aaron Lewis May 21, 2019, 5:13 p.m. UTC

Signed-off-by: Aaron Lewis <aaronlewis@google.com>
Reviewed-by: Peter Shier <pshier@google.com>
---
 tools/testing/selftests/kvm/Makefile | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

Aaron Lewis May 31, 2019, 4:37 p.m. UTC | #1

On Tue, May 21, 2019 at 10:14 AM Aaron Lewis <aaronlewis@google.com> wrote:
>
> Signed-off-by: Aaron Lewis <aaronlewis@google.com>
> Reviewed-by: Peter Shier <pshier@google.com>
> ---
>  tools/testing/selftests/kvm/Makefile | 20 ++++++++++----------
>  1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/tools/testing/selftests/kvm/Makefile b/tools/testing/selftests/kvm/Makefile
> index 79c524395ebe..234f679fa5ad 100644
> --- a/tools/testing/selftests/kvm/Makefile
> +++ b/tools/testing/selftests/kvm/Makefile
> @@ -10,23 +10,23 @@ LIBKVM = lib/assert.c lib/elf.c lib/io.c lib/kvm_util.c lib/ucall.c lib/sparsebi
>  LIBKVM_x86_64 = lib/x86_64/processor.c lib/x86_64/vmx.c
>  LIBKVM_aarch64 = lib/aarch64/processor.c
>
> -TEST_GEN_PROGS_x86_64 = x86_64/platform_info_test
> -TEST_GEN_PROGS_x86_64 += x86_64/set_sregs_test
> -TEST_GEN_PROGS_x86_64 += x86_64/sync_regs_test
> -TEST_GEN_PROGS_x86_64 += x86_64/vmx_tsc_adjust_test
> -TEST_GEN_PROGS_x86_64 += x86_64/cr4_cpuid_sync_test
> -TEST_GEN_PROGS_x86_64 += x86_64/state_test
> +TEST_GEN_PROGS_x86_64 = x86_64/cr4_cpuid_sync_test
>  TEST_GEN_PROGS_x86_64 += x86_64/evmcs_test
>  TEST_GEN_PROGS_x86_64 += x86_64/hyperv_cpuid
> -TEST_GEN_PROGS_x86_64 += x86_64/vmx_close_while_nested_test
> -TEST_GEN_PROGS_x86_64 += x86_64/smm_test
>  TEST_GEN_PROGS_x86_64 += x86_64/kvm_create_max_vcpus
> +TEST_GEN_PROGS_x86_64 += x86_64/platform_info_test
> +TEST_GEN_PROGS_x86_64 += x86_64/set_sregs_test
> +TEST_GEN_PROGS_x86_64 += x86_64/smm_test
> +TEST_GEN_PROGS_x86_64 += x86_64/state_test
> +TEST_GEN_PROGS_x86_64 += x86_64/sync_regs_test
> +TEST_GEN_PROGS_x86_64 += x86_64/vmx_close_while_nested_test
>  TEST_GEN_PROGS_x86_64 += x86_64/vmx_set_nested_state_test
> -TEST_GEN_PROGS_x86_64 += dirty_log_test
> +TEST_GEN_PROGS_x86_64 += x86_64/vmx_tsc_adjust_test
>  TEST_GEN_PROGS_x86_64 += clear_dirty_log_test
> +TEST_GEN_PROGS_x86_64 += dirty_log_test
>
> -TEST_GEN_PROGS_aarch64 += dirty_log_test
>  TEST_GEN_PROGS_aarch64 += clear_dirty_log_test
> +TEST_GEN_PROGS_aarch64 += dirty_log_test
>
>  TEST_GEN_PROGS += $(TEST_GEN_PROGS_$(UNAME_M))
>  LIBKVM += $(LIBKVM_$(UNAME_M))
> --
> 2.21.0.1020.gf2820cf01a-goog
>

Does this look okay?  It's just a simple reordering of the list.  It
helps when adding new tests.

Aaron Lewis June 18, 2019, 2:14 p.m. UTC | #2

On Fri, May 31, 2019 at 9:37 AM Aaron Lewis <aaronlewis@google.com> wrote:
>
> On Tue, May 21, 2019 at 10:14 AM Aaron Lewis <aaronlewis@google.com> wrote:
> >
> > Signed-off-by: Aaron Lewis <aaronlewis@google.com>
> > Reviewed-by: Peter Shier <pshier@google.com>
> > ---
> >  tools/testing/selftests/kvm/Makefile | 20 ++++++++++----------
> >  1 file changed, 10 insertions(+), 10 deletions(-)
> >
> > diff --git a/tools/testing/selftests/kvm/Makefile b/tools/testing/selftests/kvm/Makefile
> > index 79c524395ebe..234f679fa5ad 100644
> > --- a/tools/testing/selftests/kvm/Makefile
> > +++ b/tools/testing/selftests/kvm/Makefile
> > @@ -10,23 +10,23 @@ LIBKVM = lib/assert.c lib/elf.c lib/io.c lib/kvm_util.c lib/ucall.c lib/sparsebi
> >  LIBKVM_x86_64 = lib/x86_64/processor.c lib/x86_64/vmx.c
> >  LIBKVM_aarch64 = lib/aarch64/processor.c
> >
> > -TEST_GEN_PROGS_x86_64 = x86_64/platform_info_test
> > -TEST_GEN_PROGS_x86_64 += x86_64/set_sregs_test
> > -TEST_GEN_PROGS_x86_64 += x86_64/sync_regs_test
> > -TEST_GEN_PROGS_x86_64 += x86_64/vmx_tsc_adjust_test
> > -TEST_GEN_PROGS_x86_64 += x86_64/cr4_cpuid_sync_test
> > -TEST_GEN_PROGS_x86_64 += x86_64/state_test
> > +TEST_GEN_PROGS_x86_64 = x86_64/cr4_cpuid_sync_test
> >  TEST_GEN_PROGS_x86_64 += x86_64/evmcs_test
> >  TEST_GEN_PROGS_x86_64 += x86_64/hyperv_cpuid
> > -TEST_GEN_PROGS_x86_64 += x86_64/vmx_close_while_nested_test
> > -TEST_GEN_PROGS_x86_64 += x86_64/smm_test
> >  TEST_GEN_PROGS_x86_64 += x86_64/kvm_create_max_vcpus
> > +TEST_GEN_PROGS_x86_64 += x86_64/platform_info_test
> > +TEST_GEN_PROGS_x86_64 += x86_64/set_sregs_test
> > +TEST_GEN_PROGS_x86_64 += x86_64/smm_test
> > +TEST_GEN_PROGS_x86_64 += x86_64/state_test
> > +TEST_GEN_PROGS_x86_64 += x86_64/sync_regs_test
> > +TEST_GEN_PROGS_x86_64 += x86_64/vmx_close_while_nested_test
> >  TEST_GEN_PROGS_x86_64 += x86_64/vmx_set_nested_state_test
> > -TEST_GEN_PROGS_x86_64 += dirty_log_test
> > +TEST_GEN_PROGS_x86_64 += x86_64/vmx_tsc_adjust_test
> >  TEST_GEN_PROGS_x86_64 += clear_dirty_log_test
> > +TEST_GEN_PROGS_x86_64 += dirty_log_test
> >
> > -TEST_GEN_PROGS_aarch64 += dirty_log_test
> >  TEST_GEN_PROGS_aarch64 += clear_dirty_log_test
> > +TEST_GEN_PROGS_aarch64 += dirty_log_test
> >
> >  TEST_GEN_PROGS += $(TEST_GEN_PROGS_$(UNAME_M))
> >  LIBKVM += $(LIBKVM_$(UNAME_M))
> > --
> > 2.21.0.1020.gf2820cf01a-goog
> >
>
> Does this look okay?  It's just a simple reordering of the list.  It
> helps when adding new tests.

ping

Krish Sadhukhan June 18, 2019, 7:47 p.m. UTC | #3

On 06/18/2019 07:14 AM, Aaron Lewis wrote:
> On Fri, May 31, 2019 at 9:37 AM Aaron Lewis <aaronlewis@google.com> wrote:
>> On Tue, May 21, 2019 at 10:14 AM Aaron Lewis <aaronlewis@google.com> wrote:
>>> Signed-off-by: Aaron Lewis <aaronlewis@google.com>
>>> Reviewed-by: Peter Shier <pshier@google.com>
>>> ---
>>>   tools/testing/selftests/kvm/Makefile | 20 ++++++++++----------
>>>   1 file changed, 10 insertions(+), 10 deletions(-)
>>>
>>> diff --git a/tools/testing/selftests/kvm/Makefile b/tools/testing/selftests/kvm/Makefile
>>> index 79c524395ebe..234f679fa5ad 100644
>>> --- a/tools/testing/selftests/kvm/Makefile
>>> +++ b/tools/testing/selftests/kvm/Makefile
>>> @@ -10,23 +10,23 @@ LIBKVM = lib/assert.c lib/elf.c lib/io.c lib/kvm_util.c lib/ucall.c lib/sparsebi
>>>   LIBKVM_x86_64 = lib/x86_64/processor.c lib/x86_64/vmx.c
>>>   LIBKVM_aarch64 = lib/aarch64/processor.c
>>>
>>> -TEST_GEN_PROGS_x86_64 = x86_64/platform_info_test
>>> -TEST_GEN_PROGS_x86_64 += x86_64/set_sregs_test
>>> -TEST_GEN_PROGS_x86_64 += x86_64/sync_regs_test
>>> -TEST_GEN_PROGS_x86_64 += x86_64/vmx_tsc_adjust_test
>>> -TEST_GEN_PROGS_x86_64 += x86_64/cr4_cpuid_sync_test
>>> -TEST_GEN_PROGS_x86_64 += x86_64/state_test
>>> +TEST_GEN_PROGS_x86_64 = x86_64/cr4_cpuid_sync_test
>>>   TEST_GEN_PROGS_x86_64 += x86_64/evmcs_test
>>>   TEST_GEN_PROGS_x86_64 += x86_64/hyperv_cpuid
>>> -TEST_GEN_PROGS_x86_64 += x86_64/vmx_close_while_nested_test
>>> -TEST_GEN_PROGS_x86_64 += x86_64/smm_test
>>>   TEST_GEN_PROGS_x86_64 += x86_64/kvm_create_max_vcpus
>>> +TEST_GEN_PROGS_x86_64 += x86_64/platform_info_test
>>> +TEST_GEN_PROGS_x86_64 += x86_64/set_sregs_test
>>> +TEST_GEN_PROGS_x86_64 += x86_64/smm_test
>>> +TEST_GEN_PROGS_x86_64 += x86_64/state_test
>>> +TEST_GEN_PROGS_x86_64 += x86_64/sync_regs_test
>>> +TEST_GEN_PROGS_x86_64 += x86_64/vmx_close_while_nested_test
>>>   TEST_GEN_PROGS_x86_64 += x86_64/vmx_set_nested_state_test
>>> -TEST_GEN_PROGS_x86_64 += dirty_log_test
>>> +TEST_GEN_PROGS_x86_64 += x86_64/vmx_tsc_adjust_test
>>>   TEST_GEN_PROGS_x86_64 += clear_dirty_log_test
>>> +TEST_GEN_PROGS_x86_64 += dirty_log_test

May be, place the last two at the beginning if you are arranging them 
alphabetically ?

>>>
>>> -TEST_GEN_PROGS_aarch64 += dirty_log_test
>>>   TEST_GEN_PROGS_aarch64 += clear_dirty_log_test
>>> +TEST_GEN_PROGS_aarch64 += dirty_log_test

May be, put the aarch64 ones above the x86_64 ones to arrange them 
alphabetically ?

>>>
>>>   TEST_GEN_PROGS += $(TEST_GEN_PROGS_$(UNAME_M))
>>>   LIBKVM += $(LIBKVM_$(UNAME_M))
>>> --
>>> 2.21.0.1020.gf2820cf01a-goog
>>>
>> Does this look okay?  It's just a simple reordering of the list.  It
>> helps when adding new tests.
> ping

Aaron Lewis June 20, 2019, 3:03 p.m. UTC | #4

On Tue, Jun 18, 2019 at 12:47 PM Krish Sadhukhan
<krish.sadhukhan@oracle.com> wrote:
>
>
>
> On 06/18/2019 07:14 AM, Aaron Lewis wrote:
> > On Fri, May 31, 2019 at 9:37 AM Aaron Lewis <aaronlewis@google.com> wrote:
> >> On Tue, May 21, 2019 at 10:14 AM Aaron Lewis <aaronlewis@google.com> wrote:
> >>> Signed-off-by: Aaron Lewis <aaronlewis@google.com>
> >>> Reviewed-by: Peter Shier <pshier@google.com>
> >>> ---
> >>>   tools/testing/selftests/kvm/Makefile | 20 ++++++++++----------
> >>>   1 file changed, 10 insertions(+), 10 deletions(-)
> >>>
> >>> diff --git a/tools/testing/selftests/kvm/Makefile b/tools/testing/selftests/kvm/Makefile
> >>> index 79c524395ebe..234f679fa5ad 100644
> >>> --- a/tools/testing/selftests/kvm/Makefile
> >>> +++ b/tools/testing/selftests/kvm/Makefile
> >>> @@ -10,23 +10,23 @@ LIBKVM = lib/assert.c lib/elf.c lib/io.c lib/kvm_util.c lib/ucall.c lib/sparsebi
> >>>   LIBKVM_x86_64 = lib/x86_64/processor.c lib/x86_64/vmx.c
> >>>   LIBKVM_aarch64 = lib/aarch64/processor.c
> >>>
> >>> -TEST_GEN_PROGS_x86_64 = x86_64/platform_info_test
> >>> -TEST_GEN_PROGS_x86_64 += x86_64/set_sregs_test
> >>> -TEST_GEN_PROGS_x86_64 += x86_64/sync_regs_test
> >>> -TEST_GEN_PROGS_x86_64 += x86_64/vmx_tsc_adjust_test
> >>> -TEST_GEN_PROGS_x86_64 += x86_64/cr4_cpuid_sync_test
> >>> -TEST_GEN_PROGS_x86_64 += x86_64/state_test
> >>> +TEST_GEN_PROGS_x86_64 = x86_64/cr4_cpuid_sync_test
> >>>   TEST_GEN_PROGS_x86_64 += x86_64/evmcs_test
> >>>   TEST_GEN_PROGS_x86_64 += x86_64/hyperv_cpuid
> >>> -TEST_GEN_PROGS_x86_64 += x86_64/vmx_close_while_nested_test
> >>> -TEST_GEN_PROGS_x86_64 += x86_64/smm_test
> >>>   TEST_GEN_PROGS_x86_64 += x86_64/kvm_create_max_vcpus
> >>> +TEST_GEN_PROGS_x86_64 += x86_64/platform_info_test
> >>> +TEST_GEN_PROGS_x86_64 += x86_64/set_sregs_test
> >>> +TEST_GEN_PROGS_x86_64 += x86_64/smm_test
> >>> +TEST_GEN_PROGS_x86_64 += x86_64/state_test
> >>> +TEST_GEN_PROGS_x86_64 += x86_64/sync_regs_test
> >>> +TEST_GEN_PROGS_x86_64 += x86_64/vmx_close_while_nested_test
> >>>   TEST_GEN_PROGS_x86_64 += x86_64/vmx_set_nested_state_test
> >>> -TEST_GEN_PROGS_x86_64 += dirty_log_test
> >>> +TEST_GEN_PROGS_x86_64 += x86_64/vmx_tsc_adjust_test
> >>>   TEST_GEN_PROGS_x86_64 += clear_dirty_log_test
> >>> +TEST_GEN_PROGS_x86_64 += dirty_log_test
>
> May be, place the last two at the beginning if you are arranging them
> alphabetically ?

The original scheme had everything in x86_64 first then everything in
the root folder second.  I wanted to maintain this scheme, so that's
why it is sorted this way.

>
> >>>
> >>> -TEST_GEN_PROGS_aarch64 += dirty_log_test
> >>>   TEST_GEN_PROGS_aarch64 += clear_dirty_log_test
> >>> +TEST_GEN_PROGS_aarch64 += dirty_log_test
>
> May be, put the aarch64 ones above the x86_64 ones to arrange them
> alphabetically ?

I want to make a minimal change, so sorting the tags isn't a priority,
just the files.  The goal is to have a more predictable place to add
new tests, and I think this helps.

>
> >>>
> >>>   TEST_GEN_PROGS += $(TEST_GEN_PROGS_$(UNAME_M))
> >>>   LIBKVM += $(LIBKVM_$(UNAME_M))
> >>> --
> >>> 2.21.0.1020.gf2820cf01a-goog
> >>>
> >> Does this look okay?  It's just a simple reordering of the list.  It
> >> helps when adding new tests.
> > ping
>

Krish Sadhukhan June 20, 2019, 5:19 p.m. UTC | #5

On 6/20/19 8:03 AM, Aaron Lewis wrote:
> On Tue, Jun 18, 2019 at 12:47 PM Krish Sadhukhan
> <krish.sadhukhan@oracle.com> wrote:
>>
>>
>> On 06/18/2019 07:14 AM, Aaron Lewis wrote:
>>> On Fri, May 31, 2019 at 9:37 AM Aaron Lewis <aaronlewis@google.com> wrote:
>>>> On Tue, May 21, 2019 at 10:14 AM Aaron Lewis <aaronlewis@google.com> wrote:
>>>>> Signed-off-by: Aaron Lewis <aaronlewis@google.com>
>>>>> Reviewed-by: Peter Shier <pshier@google.com>
>>>>> ---
>>>>>    tools/testing/selftests/kvm/Makefile | 20 ++++++++++----------
>>>>>    1 file changed, 10 insertions(+), 10 deletions(-)
>>>>>
>>>>> diff --git a/tools/testing/selftests/kvm/Makefile b/tools/testing/selftests/kvm/Makefile
>>>>> index 79c524395ebe..234f679fa5ad 100644
>>>>> --- a/tools/testing/selftests/kvm/Makefile
>>>>> +++ b/tools/testing/selftests/kvm/Makefile
>>>>> @@ -10,23 +10,23 @@ LIBKVM = lib/assert.c lib/elf.c lib/io.c lib/kvm_util.c lib/ucall.c lib/sparsebi
>>>>>    LIBKVM_x86_64 = lib/x86_64/processor.c lib/x86_64/vmx.c
>>>>>    LIBKVM_aarch64 = lib/aarch64/processor.c
>>>>>
>>>>> -TEST_GEN_PROGS_x86_64 = x86_64/platform_info_test
>>>>> -TEST_GEN_PROGS_x86_64 += x86_64/set_sregs_test
>>>>> -TEST_GEN_PROGS_x86_64 += x86_64/sync_regs_test
>>>>> -TEST_GEN_PROGS_x86_64 += x86_64/vmx_tsc_adjust_test
>>>>> -TEST_GEN_PROGS_x86_64 += x86_64/cr4_cpuid_sync_test
>>>>> -TEST_GEN_PROGS_x86_64 += x86_64/state_test
>>>>> +TEST_GEN_PROGS_x86_64 = x86_64/cr4_cpuid_sync_test
>>>>>    TEST_GEN_PROGS_x86_64 += x86_64/evmcs_test
>>>>>    TEST_GEN_PROGS_x86_64 += x86_64/hyperv_cpuid
>>>>> -TEST_GEN_PROGS_x86_64 += x86_64/vmx_close_while_nested_test
>>>>> -TEST_GEN_PROGS_x86_64 += x86_64/smm_test
>>>>>    TEST_GEN_PROGS_x86_64 += x86_64/kvm_create_max_vcpus
>>>>> +TEST_GEN_PROGS_x86_64 += x86_64/platform_info_test
>>>>> +TEST_GEN_PROGS_x86_64 += x86_64/set_sregs_test
>>>>> +TEST_GEN_PROGS_x86_64 += x86_64/smm_test
>>>>> +TEST_GEN_PROGS_x86_64 += x86_64/state_test
>>>>> +TEST_GEN_PROGS_x86_64 += x86_64/sync_regs_test
>>>>> +TEST_GEN_PROGS_x86_64 += x86_64/vmx_close_while_nested_test
>>>>>    TEST_GEN_PROGS_x86_64 += x86_64/vmx_set_nested_state_test
>>>>> -TEST_GEN_PROGS_x86_64 += dirty_log_test
>>>>> +TEST_GEN_PROGS_x86_64 += x86_64/vmx_tsc_adjust_test
>>>>>    TEST_GEN_PROGS_x86_64 += clear_dirty_log_test
>>>>> +TEST_GEN_PROGS_x86_64 += dirty_log_test
>> May be, place the last two at the beginning if you are arranging them
>> alphabetically ?
> The original scheme had everything in x86_64 first then everything in
> the root folder second.  I wanted to maintain this scheme, so that's
> why it is sorted this way.
>
>>>>> -TEST_GEN_PROGS_aarch64 += dirty_log_test
>>>>>    TEST_GEN_PROGS_aarch64 += clear_dirty_log_test
>>>>> +TEST_GEN_PROGS_aarch64 += dirty_log_test
>> May be, put the aarch64 ones above the x86_64 ones to arrange them
>> alphabetically ?
> I want to make a minimal change, so sorting the tags isn't a priority,
> just the files.  The goal is to have a more predictable place to add
> new tests, and I think this helps.


Reviewed-by: Krish Sadhukhan <krish.sadhukhan@oracle.com>


>>>>>    TEST_GEN_PROGS += $(TEST_GEN_PROGS_$(UNAME_M))
>>>>>    LIBKVM += $(LIBKVM_$(UNAME_M))
>>>>> --
>>>>> 2.21.0.1020.gf2820cf01a-goog
>>>>>
>>>> Does this look okay?  It's just a simple reordering of the list.  It
>>>> helps when adding new tests.
>>> ping

kvm: tests: Sort tests in the Makefile alphabetically

Commit Message

Comments

Patch