diff options
| author | Ulf Magnusson <ulfalizer@gmail.com> | 2019-10-29 16:41:03 +0100 |
|---|---|---|
| committer | Ulf Magnusson <ulfalizer@gmail.com> | 2019-10-29 18:30:46 +0100 |
| commit | e1ccf19f9f5fc896dfeef15883d2cb455cbbb937 (patch) | |
| tree | 10cc86a8840315f0ec4c603abad7c4a2b840e2a6 /tests | |
| parent | 2d1cb7eae230a560e02b7a8bdee2cf0526d169e2 (diff) | |
Add public helpers for generating "<name> (defined at ...)" strings
Have Symbol/Choice.name_and_loc return strings like
"MY_SYM (defined at foo:1, bar:2)"
"<choice> (defined at foo:4)"
I've added a function like that in at least four different scripts now,
so that's probably a sign that it's a worthwhile helper.
Clean up the tests/Klocation tests a bit while adding tests.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Klocation | 16 | ||||
| -rw-r--r-- | tests/Klocation_sourced | 14 | ||||
| -rw-r--r-- | tests/sub/Klocation_grsourced1 | 2 | ||||
| -rw-r--r-- | tests/sub/Klocation_grsourced2 | 2 | ||||
| -rw-r--r-- | tests/sub/Klocation_gsourced1 | 2 | ||||
| -rw-r--r-- | tests/sub/Klocation_gsourced2 | 2 | ||||
| -rw-r--r-- | tests/sub/Klocation_rsourced | 2 |
7 files changed, 27 insertions, 13 deletions
diff --git a/tests/Klocation b/tests/Klocation index f997055..3820a7b 100644 --- a/tests/Klocation +++ b/tests/Klocation @@ -1,10 +1,16 @@ if UNDEFINED endif -config SINGLE_DEF +config ONE_DEF bool -config MULTI_DEF +config TWO_DEF + bool + +config TWO_DEF + bool + +config MANY_DEF bool # Throw in some line continuations too to make sure it doesn't mess up the line @@ -34,9 +40,9 @@ config HELP_3 bar bool config \ -MULTI_DEF +MANY_DEF -config MULTI_DEF +config MANY_DEF endif endif @@ -69,4 +75,4 @@ orsource "nonexistent*" grsource "nonexistent" grsource "nonexistent*" -config MULTI_DEF +config MANY_DEF diff --git a/tests/Klocation_sourced b/tests/Klocation_sourced index 6e19f76..2ad8481 100644 --- a/tests/Klocation_sourced +++ b/tests/Klocation_sourced @@ -1,9 +1,17 @@ -config MULTI_DEF +config MANY_DEF -choice CHOICE - bool "choice" +choice CHOICE_ONE_DEF + bool "one-def choice" +endchoice + +choice CHOICE_TWO_DEF + bool "two-def choice 1" +endchoice + +choice CHOICE_TWO_DEF + bool "two-def choice 2" endchoice config MENU_HOOK diff --git a/tests/sub/Klocation_grsourced1 b/tests/sub/Klocation_grsourced1 index 49dac36..1e04ad6 100644 --- a/tests/sub/Klocation_grsourced1 +++ b/tests/sub/Klocation_grsourced1 @@ -1 +1 @@ -config MULTI_DEF +config MANY_DEF diff --git a/tests/sub/Klocation_grsourced2 b/tests/sub/Klocation_grsourced2 index 49dac36..1e04ad6 100644 --- a/tests/sub/Klocation_grsourced2 +++ b/tests/sub/Klocation_grsourced2 @@ -1 +1 @@ -config MULTI_DEF +config MANY_DEF diff --git a/tests/sub/Klocation_gsourced1 b/tests/sub/Klocation_gsourced1 index 49dac36..1e04ad6 100644 --- a/tests/sub/Klocation_gsourced1 +++ b/tests/sub/Klocation_gsourced1 @@ -1 +1 @@ -config MULTI_DEF +config MANY_DEF diff --git a/tests/sub/Klocation_gsourced2 b/tests/sub/Klocation_gsourced2 index 49dac36..1e04ad6 100644 --- a/tests/sub/Klocation_gsourced2 +++ b/tests/sub/Klocation_gsourced2 @@ -1 +1 @@ -config MULTI_DEF +config MANY_DEF diff --git a/tests/sub/Klocation_rsourced b/tests/sub/Klocation_rsourced index c6f185d..12fdbc2 100644 --- a/tests/sub/Klocation_rsourced +++ b/tests/sub/Klocation_rsourced @@ -1,2 +1,2 @@ -config MULTI_DEF +config MANY_DEF |