summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-12-18 12:23:27 -0500
committerTom Rini <trini@konsulko.com>2017-12-18 12:23:27 -0500
commit90d75d2efc376094b50d84de80e9cb8b3bcae032 (patch)
treea5bcce535313c824bca832b9b9ccbc7f870d35fa /test
parenta9e670d46f1916d6fb925244d5d4c9a48db8e26b (diff)
parent3e229a83bd4190f99731992d3a56983f29313899 (diff)
downloadu-boot-90d75d2efc376094b50d84de80e9cb8b3bcae032.tar.gz
u-boot-90d75d2efc376094b50d84de80e9cb8b3bcae032.tar.bz2
u-boot-90d75d2efc376094b50d84de80e9cb8b3bcae032.zip
Merge tag 'xilinx-for-v2018.01-rc2-v2' of git://www.denx.de/git/u-boot-microblaze
Xilinx changes for v2018.01-rc2-v2 fpga: - Enable loading bitstream via fit image for !xilinx platforms zynq: - Fix SPL SD boot mode zynqmp: - Not not reset in panic - Do not use simple allocator because of fat changes - Various dt chagnes - modeboot variable setup - Fix fpga loading on automotive devices - Fix coverity issues test: - Fix env test for !hush case - Stephen's patch
Diffstat (limited to 'test')
-rw-r--r--test/py/tests/test_env.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/test/py/tests/test_env.py b/test/py/tests/test_env.py
index b7f960c755..f8694017b4 100644
--- a/test/py/tests/test_env.py
+++ b/test/py/tests/test_env.py
@@ -125,7 +125,16 @@ def set_var(state_test_env, var, value):
Nothing.
"""
- state_test_env.u_boot_console.run_command('setenv %s "%s"' % (var, value))
+ bc = state_test_env.u_boot_console.config.buildconfig
+ if bc.get('config_hush_parser', None):
+ quote = '"'
+ else:
+ quote = ''
+ if ' ' in value:
+ pytest.skip('Space in variable value on non-Hush shell')
+
+ state_test_env.u_boot_console.run_command(
+ 'setenv %s %s%s%s' % (var, quote, value, quote))
state_test_env.env[var] = value
def validate_empty(state_test_env, var):