Mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-06-02 09:46:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

cmd: test: fix handling of single-argument form of test

Browse Source 
POSIX states that

  0 arguments:
      Exit false (1).
  1 argument:
      Exit true (0) if $1 is not null; otherwise, exit false.

and at least bash and busybox sh behave that way.

The current 'argc < 3' does the right thing for a non-existing or
empty argv[1], but not for a non-empty argv[1]. Fix that and add
corresponding test cases.

Signed-off-by: Rasmus Villemoes <ravi@prevas.dk>
Tested-by: Anshul Dalal <anshuld@ti.com>
This commit is contained in:
Rasmus Villemoes
2026-03-12 11:01:06 +01:00
committed by Tom Rini
parent 6f9cc3310a
commit 8b0619579b
2 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/test.c
View File

@@ -71,10 +71,17 @@ static int do_test(struct cmd_tbl *cmdtp, int flag, int argc,
argc--;
}
/* args? */
if (argc < 3)
/*
* Per POSIX, 'test' with 0 arguments should return 1, while
* 'test <arg>' should be equivalent to 'test -n <arg>',
* i.e. true if and only if <arg> is not empty.
*/
if (argc < 2)
return 1;
if (argc == 2)
return !strcmp(argv[1], "");
#ifdef DEBUG
{
debug("test(%d):", argc);

30
test/hush/if.c
View File

@@ -32,6 +32,15 @@ static int hush_test_if_base(struct unit_test_state *uts)
sprintf(if_formatted, if_format, "false");
ut_asserteq(1, run_command(if_formatted, 0));
sprintf(if_formatted, if_format, "test");
ut_asserteq(1, run_command(if_formatted, 0));
sprintf(if_formatted, if_format, "test ''");
ut_asserteq(1, run_command(if_formatted, 0));
sprintf(if_formatted, if_format, "test 'abc'");
ut_assertok(run_command(if_formatted, 0));
return 0;
}
HUSH_TEST(hush_test_if_base, 0);
@@ -355,6 +364,27 @@ static int hush_test_lbracket_alias(struct unit_test_state *uts)
sprintf(if_formatted, if_format, "[ ! aaa != aaa -o ! bbb = bbb ]");
ut_assertok(run_command(if_formatted, 0));
sprintf(if_formatted, if_format, "[ ]");
ut_asserteq(1, run_command(if_formatted, 0));
sprintf(if_formatted, if_format, "[");
ut_asserteq(1, run_command(if_formatted, 0));
ut_assert_nextline(missing_rbracket_error);
sprintf(if_formatted, if_format, "[ '' ]");
ut_asserteq(1, run_command(if_formatted, 0));
sprintf(if_formatted, if_format, "[ ''");
ut_asserteq(1, run_command(if_formatted, 0));
ut_assert_nextline(missing_rbracket_error);
sprintf(if_formatted, if_format, "[ 'abc' ]");
ut_assertok(run_command(if_formatted, 0));
sprintf(if_formatted, if_format, "[ 'abc'");
ut_asserteq(1, run_command(if_formatted, 0));
ut_assert_nextline(missing_rbracket_error);
return 0;
}
HUSH_TEST(hush_test_lbracket_alias, UTF_CONSOLE);