From daac69dc05217d024fbe021447629fa2b3d95b70 Mon Sep 17 00:00:00 2001 From: Ulf Magnusson Date: Tue, 13 Mar 2018 03:24:41 +0100 Subject: Add a globbing source statement 'gsource' works like 'source', but takes a glob pattern and sources all matching files. Works as a no-op if no files match, and hence doubles as an include-if-exists function, similar to '-include' in 'make'. Add a 'grsource' statement as well, mirroring 'rsource'. Came up in https://github.com/ulfalizer/Kconfiglib/pull/40. --- tests/Klocation | 20 ++++++++++++++++++++ tests/sub/Klocation_grsourced1 | 1 + tests/sub/Klocation_grsourced2 | 1 + tests/sub/Klocation_gsourced1 | 1 + tests/sub/Klocation_gsourced2 | 1 + 5 files changed, 24 insertions(+) create mode 100644 tests/sub/Klocation_grsourced1 create mode 100644 tests/sub/Klocation_grsourced2 create mode 100644 tests/sub/Klocation_gsourced1 create mode 100644 tests/sub/Klocation_gsourced2 (limited to 'tests') diff --git a/tests/Klocation b/tests/Klocation index aa176b2..99a8ee0 100644 --- a/tests/Klocation +++ b/tests/Klocation @@ -49,9 +49,29 @@ config _RSOURCED string default "_rsourced" +config _GSOURCED + string + default "_gsourced" + +config _GRSOURCED + string + default "_grsourced" + # Expands to "tests/Klocation_sourced" source "$TESTS_DIR_FROM_ENV/Klocation$_SOURCED" + # Expands to "sub/Klocation_rsourced" rsource "$SUB_DIR_FROM_ENV/Klocation$_RSOURCED" +# Expands to "tests/*ub/Klocation_gsourced[12]", matching +# tests/sub/Klocation_gsourced{1,2} +gsource "$TESTS_DIR_FROM_ENV/*ub/Klocation$_GSOURCED[12]" + +# Expands to "sub/Klocation_grsourced[12]", matching +# tests/sub/Klocation_grsourced{1,2} +grsource "$SUB_DIR_FROM_ENV/Klocation$_GRSOURCED[12]" + +# No-op +gsource "nonexisting file" + config MULTI_DEF diff --git a/tests/sub/Klocation_grsourced1 b/tests/sub/Klocation_grsourced1 new file mode 100644 index 0000000..49dac36 --- /dev/null +++ b/tests/sub/Klocation_grsourced1 @@ -0,0 +1 @@ +config MULTI_DEF diff --git a/tests/sub/Klocation_grsourced2 b/tests/sub/Klocation_grsourced2 new file mode 100644 index 0000000..49dac36 --- /dev/null +++ b/tests/sub/Klocation_grsourced2 @@ -0,0 +1 @@ +config MULTI_DEF diff --git a/tests/sub/Klocation_gsourced1 b/tests/sub/Klocation_gsourced1 new file mode 100644 index 0000000..49dac36 --- /dev/null +++ b/tests/sub/Klocation_gsourced1 @@ -0,0 +1 @@ +config MULTI_DEF diff --git a/tests/sub/Klocation_gsourced2 b/tests/sub/Klocation_gsourced2 new file mode 100644 index 0000000..49dac36 --- /dev/null +++ b/tests/sub/Klocation_gsourced2 @@ -0,0 +1 @@ +config MULTI_DEF -- cgit v1.2.3