X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Ftimothy_tests%2Fquick_tests%2Ftest_yaffs_read.c;h=a5157d24f7d4064c603dea33fc023e3de18cfdfc;hp=d396ff607efa8075169568411b2b55dfb0bf9724;hb=4f90d524e3c666c53ae36ad2911e00e5b3741cca;hpb=6bdb202d06f1e3dc8cc00dea708ebbd7fb771342

diff --git a/direct/timothy_tests/quick_tests/test_yaffs_read.c b/direct/timothy_tests/quick_tests/test_yaffs_read.c
index d396ff6..a5157d2 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_read.c
+++ b/direct/timothy_tests/quick_tests/test_yaffs_read.c
@@ -1,18 +1,35 @@
-#include "test_yaffs_write.h"
+/*
+ * YAFFS: Yet another FFS. A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2010 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Timothy Manning <timothy@yaffs.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "test_yaffs_read.h"
+
+static int handle=-1;
 
 int test_yaffs_read(void){
-	int handle=test_open_file();
+	handle=test_yaffs_open();
 	char text[20]="\0";
 	int output=0;
-	if (handle>0){
+	//printf("handle %d\n",handle);
+	if (handle>=0){
 		output=yaffs_read(handle, text, FILE_TEXT_NBYTES);
-		printf("output: %d\n",output);
+		//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 (text==FILE_TEXT){
+			if (0==memcmp(text,FILE_TEXT,FILE_TEXT_NBYTES)){
 				return 1;
 			}
 			else {
-				printf("text does not match the the text that should be in the file\n");
+				printf("returned text does not match the the expected text that should be in the file\n");
 				return -1;
 			}
 		}
@@ -29,7 +46,10 @@ int test_yaffs_read(void){
 }
 
 int test_yaffs_read_clean(void){
-	/* need to reset the seek position*/
-	
-	return test_yaffs_lseek_to_beginning();
+	if (handle>=0){
+		return yaffs_close(handle);
+	}
+	else {
+		return 1; /* no handle was opened so there is no need to close a handle */
+	}	
 }