unit-test: make "test -e" test independent of $CWD
The unit-test for hush's "test -e" currently relies upon being run in the U-Boot build directory, because it tests for the existence of a file that exists in that directory. Fix this by explicitly creating the file we use for the existence test, and deleting it afterwards so that multiple successive unit-test invocations succeed. This required adding an os.c function to erase files. Reported-by: Simon Glass <sjg@chromium.org> Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
This commit is contained in:
parent
fe9ca3d328
commit
cfd13e8dda
@ -92,6 +92,11 @@ int os_close(int fd)
|
||||
return close(fd);
|
||||
}
|
||||
|
||||
int os_unlink(const char *pathname)
|
||||
{
|
||||
return unlink(pathname);
|
||||
}
|
||||
|
||||
void os_exit(int exit_code)
|
||||
{
|
||||
exit(exit_code);
|
||||
|
@ -83,6 +83,14 @@ int os_open(const char *pathname, int flags);
|
||||
*/
|
||||
int os_close(int fd);
|
||||
|
||||
/**
|
||||
* Access to the OS unlink() system call
|
||||
*
|
||||
* \param pathname Path of file to delete
|
||||
* \return 0 for success, other for error
|
||||
*/
|
||||
int os_unlink(const char *pathname);
|
||||
|
||||
/**
|
||||
* Access to the OS exit() system call
|
||||
*
|
||||
|
@ -7,6 +7,9 @@
|
||||
#define DEBUG
|
||||
|
||||
#include <common.h>
|
||||
#ifdef CONFIG_SANDBOX
|
||||
#include <os.h>
|
||||
#endif
|
||||
|
||||
static const char test_cmd[] = "setenv list 1\n setenv list ${list}2; "
|
||||
"setenv list ${list}3\0"
|
||||
@ -156,11 +159,12 @@ static int do_ut_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
||||
setenv("ut_var_test", NULL);
|
||||
|
||||
#ifdef CONFIG_SANDBOX
|
||||
/*
|
||||
* File existence
|
||||
* This assume U-Boot sandbox is run from the U-Boot build directory
|
||||
*/
|
||||
HUSH_TEST(e, "-e host - u-boot", y);
|
||||
/* File existence */
|
||||
HUSH_TEST(e, "-e host - creating_this_file_breaks_uboot_unit_test", n);
|
||||
run_command("sb save host - creating_this_file_breaks_uboot_unit_test 0 1", 0);
|
||||
HUSH_TEST(e, "-e host - creating_this_file_breaks_uboot_unit_test", y);
|
||||
/* Perhaps this could be replaced by an "rm" shell command one day */
|
||||
assert(!os_unlink("creating_this_file_breaks_uboot_unit_test"));
|
||||
HUSH_TEST(e, "-e host - creating_this_file_breaks_uboot_unit_test", n);
|
||||
#endif
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user