At present the tests assume that gawk is being used. Adjust the tests so that the names are inserted in alphabetical order, so that awk is happy.

Also use PROCINFO to make gawk output in alphabetical order. This is not ideal, since it changes the env-car ordering from what the user provided, but it may be acceptable.

Signed-off-by: Simon Glass sjg@chromium.org Reported-by: Patrick Delaunay patrick.delaunay@foss.st.com Fixes: https://source.denx.de/u-boot/u-boot/-/issues/10 ---

scripts/env2string.awk | 5 ++++- test/py/tests/test_env.py | 28 ++++++++++++++-------------- 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/scripts/env2string.awk b/scripts/env2string.awk index 1bfe9ed07a4..de470a49941 100644 --- a/scripts/env2string.awk +++ b/scripts/env2string.awk @@ -81,7 +81,10 @@ END { if (do_output) { printf("%s", "#define CONFIG_EXTRA_ENV_TEXT "")

- # Print out all the variables + # Print out all the variables by alphabetic order, if using + # gawk. This allows test_env_test.py to work on both awk (where + # this next line does nothing) + PROCINFO["sorted_in"] = "@ind_str_asc" for (var in vars) { env = vars[var] print var "=" vars[var] "\0" diff --git a/test/py/tests/test_env.py b/test/py/tests/test_env.py index b2f3470de94..6d08565f0b5 100644 --- a/test/py/tests/test_env.py +++ b/test/py/tests/test_env.py @@ -554,42 +554,42 @@ def test_env_text(u_boot_console):

# two vars check_script('''fred=123 -ernie=456''', 'fred=123\0ernie=456\0') +mary=456''', 'fred=123\0mary=456\0')

# blank lines check_script('''fred=123

-ernie=456 +mary=456

-''', 'fred=123\0ernie=456\0') +''', 'fred=123\0mary=456\0')

# append check_script('''fred=123 -ernie=456 -fred+= 456''', 'fred=123 456\0ernie=456\0') +mary=456 +fred+= 456''', 'fred=123 456\0mary=456\0')

# append from empty check_script('''fred= -ernie=456 -fred+= 456''', 'fred= 456\0ernie=456\0') +mary=456 +fred+= 456''', 'fred= 456\0mary=456\0')

# variable with + in it - check_script('fred+ernie=123', 'fred+ernie=123\0') + check_script('fred+mary=123', 'fred+mary=123\0')

# ignores variables that are empty check_script('''fred= fred+= -ernie=456''', 'ernie=456\0') +mary=456''', 'mary=456\0')

# single-character env name - check_script('''f=123 + check_script('''m=123 e=456 -f+= 456''', 'e=456\0f=123 456\0') +m+= 456''', 'e=456\0m=123 456\0')

# contains quotes check_script('''fred="my var" -ernie=another"''', 'fred=\"my var\"\0ernie=another\"\0') +mary=another"''', 'fred=\"my var\"\0mary=another\"\0')

# variable name ending in + check_script('''fred\+=my var @@ -598,7 +598,7 @@ fred++= again''', 'fred+=my var again\0') # variable name containing + check_script('''fred+jane=both fred+jane+=again -ernie=456''', 'fred+jane=bothagain\0ernie=456\0') +mary=456''', 'fred+jane=bothagain\0mary=456\0')

# multi-line vars - new vars always start at column 1 check_script('''fred=first @@ -607,7 +607,7 @@ ernie=456''', 'fred+jane=bothagain\0ernie=456\0')

after blank confusing=oops -ernie=another"''', 'fred=first second third with tab after blank confusing=oops\0ernie=another\"\0') +mary=another"''', 'fred=first second third with tab after blank confusing=oops\0mary=another\"\0')

# real-world example check_script('''ubifs_boot=