diff mbox series

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

Message ID 20240802164626.389286-5-stephen@networkplumber.org (mailing list archive)
State Superseded
Delegated to: Thomas Monjalon
Headers
Series restore unused cfgfile tests |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/loongarch-compilation success Compilation OK
ci/loongarch-unit-testing success Unit Testing PASS
ci/Intel-compilation success Compilation OK
ci/intel-Testing success Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/github-robot: build success github build: passed
ci/iol-marvell-Functional success Functional Testing PASS
ci/iol-broadcom-Functional success Functional Testing PASS
ci/iol-abi-testing success Testing PASS
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-compile-amd64-testing success Testing PASS
ci/iol-unit-arm64-testing success Testing PASS
ci/iol-unit-amd64-testing success Testing PASS
ci/iol-compile-arm64-testing success Testing PASS
ci/intel-Functional success Functional PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-sample-apps-testing success Testing PASS

Commit Message

Stephen Hemminger Aug. 2, 2024, 4:45 p.m. UTC 
The input files don't need to be in a separate subdirectory.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 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%)

Comments

Bruce Richardson Aug. 2, 2024, 4:51 p.m. UTC | #1 
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@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@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
>
Stephen Hemminger Aug. 2, 2024, 5:06 p.m. UTC | #2 
On Fri, 2 Aug 2024 17:51:01 +0100
Bruce Richardson <bruce.richardson@intel.com> wrote:

> 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@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@intel.com>

Sure it would be logical to merge the two, just wanted the patches to
be smaller and easier to review
Bruce Richardson Aug. 6, 2024, 8:37 a.m. UTC | #3 
On Fri, Aug 02, 2024 at 10:06:35AM -0700, Stephen Hemminger wrote:
> On Fri, 2 Aug 2024 17:51:01 +0100
> Bruce Richardson <bruce.richardson@intel.com> wrote:
> 
> > 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@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@intel.com>
> 
> Sure it would be logical to merge the two, just wanted the patches to
> be smaller and easier to review 
> 
I actually think they are better separate, just switch the order.

/Bruce
diff mbox series

Patch

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