projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge in yaffsfs.c changes
[yaffs2.git]
/
direct
/
timothy_tests
/
quick_tests
/
test_yaffs_rename_dir_to_file.c
diff --git
a/direct/timothy_tests/quick_tests/test_yaffs_rename_dir_to_file.c
b/direct/timothy_tests/quick_tests/test_yaffs_rename_dir_to_file.c
index d87b8ab6adebeea7f7d60201c1b60d65790fcfbf..b191dbb9d18839ec4febbcb0fa830e733ebfd9cb 100644
(file)
--- a/
direct/timothy_tests/quick_tests/test_yaffs_rename_dir_to_file.c
+++ b/
direct/timothy_tests/quick_tests/test_yaffs_rename_dir_to_file.c
@@
-1,7
+1,7
@@
/*
* YAFFS: Yet another FFS. A NAND-flash specific file system.
*
/*
* YAFFS: Yet another FFS. A NAND-flash specific file system.
*
- * Copyright (C) 2002-201
0
Aleph One Ltd.
+ * Copyright (C) 2002-201
1
Aleph One Ltd.
* for Toby Churchill Ltd and Brightstar Engineering
*
* Created by Timothy Manning <timothy@yaffs.net>
* for Toby Churchill Ltd and Brightstar Engineering
*
* Created by Timothy Manning <timothy@yaffs.net>
@@
-21,7
+21,14
@@
int test_yaffs_rename_dir_to_file(void)
if (0 != yaffs_access(DIR_PATH,0)) {
output= yaffs_mkdir(DIR_PATH,(S_IREAD | S_IWRITE));
if (output<0) {
if (0 != yaffs_access(DIR_PATH,0)) {
output= yaffs_mkdir(DIR_PATH,(S_IREAD | S_IWRITE));
if (output<0) {
- print_message("failed to create directory\n",2);
+ print_message("failed to remove directory\n",2);
+ return -1;
+ }
+ }
+ if (0 != yaffs_access(RENAME_PATH,0)) {
+ output= yaffs_mkdir(RENAME_PATH,(S_IREAD | S_IWRITE));
+ if (output<0) {
+ print_message("failed to remove file\n",2);
return -1;
}
}
return -1;
}
}