[PATCH v5 4/4] test: rearrange test_cfgfiles cases

[Bruce Richardson]

On Fri, Aug 02, 2024 at 09:45:03AM -0700, Stephen Hemminger wrote:
> The input files don't need to be in a separate subdirectory.
> 
> Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>

Small suggestion - I'd move this up to be patch 3, rather than patch 4,
which would save editing the list in the meson.build file to remove the
"etc/" prefix

Acked-by: Bruce Richardson <bruce.richardson at intel.com>
> ---
>  app/test/test_cfgfiles/{etc => }/empty.ini       |  0
>  .../test_cfgfiles/{etc => }/empty_key_value.ini  |  0
>  .../test_cfgfiles/{etc => }/invalid_section.ini  |  0
>  .../test_cfgfiles/{etc => }/line_too_long.ini    |  0
>  app/test/test_cfgfiles/meson.build               | 16 ++++++++--------
>  .../test_cfgfiles/{etc => }/missing_section.ini  |  0
>  .../test_cfgfiles/{etc => }/realloc_sections.ini |  0
>  app/test/test_cfgfiles/{etc => }/sample1.ini     |  0
>  app/test/test_cfgfiles/{etc => }/sample2.ini     |  0
>  9 files changed, 8 insertions(+), 8 deletions(-)
>  rename app/test/test_cfgfiles/{etc => }/empty.ini (100%)
>  rename app/test/test_cfgfiles/{etc => }/empty_key_value.ini (100%)
>  rename app/test/test_cfgfiles/{etc => }/invalid_section.ini (100%)
>  rename app/test/test_cfgfiles/{etc => }/line_too_long.ini (100%)
>  rename app/test/test_cfgfiles/{etc => }/missing_section.ini (100%)
>  rename app/test/test_cfgfiles/{etc => }/realloc_sections.ini (100%)
>  rename app/test/test_cfgfiles/{etc => }/sample1.ini (100%)
>  rename app/test/test_cfgfiles/{etc => }/sample2.ini (100%)
> 
> diff --git a/app/test/test_cfgfiles/etc/empty.ini b/app/test/test_cfgfiles/empty.ini
> similarity index 100%
> rename from app/test/test_cfgfiles/etc/empty.ini
> rename to app/test/test_cfgfiles/empty.ini
> diff --git a/app/test/test_cfgfiles/etc/empty_key_value.ini b/app/test/test_cfgfiles/empty_key_value.ini
> similarity index 100%
> rename from app/test/test_cfgfiles/etc/empty_key_value.ini
> rename to app/test/test_cfgfiles/empty_key_value.ini
> diff --git a/app/test/test_cfgfiles/etc/invalid_section.ini b/app/test/test_cfgfiles/invalid_section.ini
> similarity index 100%
> rename from app/test/test_cfgfiles/etc/invalid_section.ini
> rename to app/test/test_cfgfiles/invalid_section.ini
> diff --git a/app/test/test_cfgfiles/etc/line_too_long.ini b/app/test/test_cfgfiles/line_too_long.ini
> similarity index 100%
> rename from app/test/test_cfgfiles/etc/line_too_long.ini
> rename to app/test/test_cfgfiles/line_too_long.ini
> diff --git a/app/test/test_cfgfiles/meson.build b/app/test/test_cfgfiles/meson.build
> index 068b61044a..348c78c7d9 100644
> --- a/app/test/test_cfgfiles/meson.build
> +++ b/app/test/test_cfgfiles/meson.build
> @@ -1,14 +1,14 @@
>  # SPDX-License-Identifier: BSD-3-Clause
>  
>  test_cfgfiles = files(
> -    'etc/empty.ini',
> -    'etc/empty_key_value.ini',
> -    'etc/invalid_section.ini',
> -    'etc/line_too_long.ini',
> -    'etc/missing_section.ini',
> -    'etc/realloc_sections.ini',
> -    'etc/sample1.ini',
> -    'etc/sample2.ini',
> +    'empty.ini',
> +    'empty_key_value.ini',
> +    'invalid_section.ini',
> +    'line_too_long.ini',
> +    'missing_section.ini',
> +    'realloc_sections.ini',
> +    'sample1.ini',
> +    'sample2.ini',
>  )
>  
>  # generate the header file used in cfgfile test
> diff --git a/app/test/test_cfgfiles/etc/missing_section.ini b/app/test/test_cfgfiles/missing_section.ini
> similarity index 100%
> rename from app/test/test_cfgfiles/etc/missing_section.ini
> rename to app/test/test_cfgfiles/missing_section.ini
> diff --git a/app/test/test_cfgfiles/etc/realloc_sections.ini b/app/test/test_cfgfiles/realloc_sections.ini
> similarity index 100%
> rename from app/test/test_cfgfiles/etc/realloc_sections.ini
> rename to app/test/test_cfgfiles/realloc_sections.ini
> diff --git a/app/test/test_cfgfiles/etc/sample1.ini b/app/test/test_cfgfiles/sample1.ini
> similarity index 100%
> rename from app/test/test_cfgfiles/etc/sample1.ini
> rename to app/test/test_cfgfiles/sample1.ini
> diff --git a/app/test/test_cfgfiles/etc/sample2.ini b/app/test/test_cfgfiles/sample2.ini
> similarity index 100%
> rename from app/test/test_cfgfiles/etc/sample2.ini
> rename to app/test/test_cfgfiles/sample2.ini
> -- 
> 2.43.0
>