projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yaffs fixed some merge issues in direct/timothy_tests/quick_tests
[yaffs2.git]
/
direct
/
timothy_tests
/
quick_tests
/
test_yaffs_read.c
diff --git
a/direct/timothy_tests/quick_tests/test_yaffs_read.c
b/direct/timothy_tests/quick_tests/test_yaffs_read.c
index 2bc2aba6c964eed2ea0ac0a042e32917c0045618..48e98260ff15d500f041acfbd94fab982fd0bda0 100644
(file)
--- a/
direct/timothy_tests/quick_tests/test_yaffs_read.c
+++ b/
direct/timothy_tests/quick_tests/test_yaffs_read.c
@@
-13,38
+13,39
@@
#include "test_yaffs_read.h"
#include "test_yaffs_read.h"
-static int handle=
0
;
+static int handle=
-1
;
-int test_yaffs_read(void)
{
- handle=test_yaffs_open();
- char text[20]
=
"\0";
+int test_yaffs_read(void)
+{
+ char text[20]
=
"\0";
int output=0;
int output=0;
- //printf("handle %d\n",handle);
+
+ handle = test_yaffs_open();
if (handle>=0){
output=yaffs_read(handle, text, FILE_TEXT_NBYTES);
if (handle>=0){
output=yaffs_read(handle, text, FILE_TEXT_NBYTES);
- //printf("yaffs_test_read output: %d\n",output);
- //printf("text in file is: '%s' expected text is '%s'\n",text,FILE_TEXT);
if (output>0){
if (0==memcmp(text,FILE_TEXT,FILE_TEXT_NBYTES)){
return 1;
if (output>0){
if (0==memcmp(text,FILE_TEXT,FILE_TEXT_NBYTES)){
return 1;
- }
- else {
- printf("returned text does not match the the expected text that should be in the file\n");
+ } else {
+ print_message("returned text does not match the the expected text that should be in the file\n", 2);
return -1;
}
return -1;
}
- }
- else{
- printf("error reading file\n");
+ } else{
+ print_message("error reading file\n", 2);
return -1;
}
return -1;
}
- }
- else {
- printf("error opening file\n");
+ } else {
+ print_message("error opening file\n", 2);
return -1;
}
return -1;
}
-
}
}
-int test_yaffs_read_clean(void){
- return yaffs_close(handle);
+int test_yaffs_read_clean(void)
+{
+ if (handle>=0){
+ return yaffs_close(handle);
+ }
+ else {
+ return 1; /* no handle was opened so there is no need to close a handle */
+ }
}
}