X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fcli%2Fparams%2Ftest_params;h=c207532a50e888f2a908dbdf9f777f3c60e35f6e;hb=75e396f6b20bdf52c76a3c7312e7fb815ac1e5e9;hp=7403fea719ea62d9d5c52af91f160f4b24831c4f;hpb=3971c70163bbc4056e285932580e0e731b40a151;p=babeltrace.git diff --git a/tests/cli/params/test_params b/tests/cli/params/test_params index 7403fea7..c207532a 100755 --- a/tests/cli/params/test_params +++ b/tests/cli/params/test_params @@ -1,24 +1,14 @@ #!/bin/bash # -# Copyright (C) 2019 Simon Marchi -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License, version 2 only, as -# published by the Free Software Foundation. +# SPDX-License-Identifier: GPL-2.0-only # -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. +# Copyright (C) 2019 Simon Marchi # -# You should have received a copy of the GNU General Public License along with -# this program; if not, write to the Free Software Foundation, Inc., 51 -# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # Test how parameters are applied to sources auto-discovered by the convert # command. -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../../utils/utils.sh" @@ -65,7 +55,7 @@ expect_success 'float scientific notation' 'a=10.5e6, b=10.5E6, c=10.5e-6, d=10. '{a=10500000.0, b=10500000.0, c=1.05e-05, d=1.05e-05}' expect_success 'array' 'a=[1, [["hi",]]]' \ '{a=[1, [[hi]]]}' -expect_success 'map' 'a={},b={salut="la gang",comment="ca va",oh={x=2}}' \ +expect_success 'map' 'a=4,a={},b={salut="la gang",comment="ca va",oh={x=2}}' \ '{a={}, b={comment=ca va, oh={x=2}, salut=la gang}}' rm -f "$expected_file"