Merge branch 'big-files': Merge in large file support

[yaffs2.git] / direct / timothy_tests / quick_tests / test_yaffs_unlink_ENOENT.c

diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unlink_ENOENT.c b/direct/timothy_tests/quick_tests/test_yaffs_unlink_ENOENT.c
index 50803e5d69994c11656db0f0914e448ad450bf09..9875304f6756b744df83b4a96d6c397522585a37 100644 (file)
--- a/direct/timothy_tests/quick_tests/test_yaffs_unlink_ENOENT.c
+++ b/direct/timothy_tests/quick_tests/test_yaffs_unlink_ENOENT.c
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another FFS. A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2010 Aleph One Ltd.
+ * Copyright (C) 2002-2011 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Timothy Manning <timothy@yaffs.net>
@@ -11,39 +11,34 @@
  * published by the Free Software Foundation.
  */
 
-#include "test_yaffs_unlink_EISDIR.h"
+#include "test_yaffs_unlink_ENOENT.h"
 
-/*EISDIR is caused by trying to unlink a directory */
+static int handle=-1;
 
-static int handle=0;
-int test_yaffs_unlink_ENOENT(void){
-       int output=0;
+int test_yaffs_unlink_ENOENT(void)
+{
        int error_code=0;
-       /*printf("path %s\n",path); */
+
        handle=yaffs_unlink("/yaffs2/non_existant_file");
        if (handle==-1){
                error_code=yaffs_get_error();
-               //printf("ENOENT def %d, Error code %d\n", EISDIR,error_code);
-               if (abs(error_code)== ENOENT){
+               if (abs(error_code) == ENOENT){
                        return 1;
-               }
-               else {
-                       printf("different error than expected\n");
+               } else {
+                       print_message("different error than expected\n",2);
                        return -1;
                }
-       }
-       else if (output >=0){
-               printf("directory unlinked opened.(which is a bad thing)\n");
+       } else {
+               print_message("non existant file unlinked.(which is a bad thing)\n",2);
                return -1;
        }
-       /* the program should not get here but the compiler is complaining */
-       return -1;
+
 }
-int test_yaffs_unlink_ENOENT_clean(void){
-       if (handle >=0){
-               return yaffs_close(handle);
-       }
-       else {
+int test_yaffs_unlink_ENOENT_clean(void)
+{
+       if (handle >= 0){
+               return test_yaffs_open();
+       } else {
                return 1;       /* the file failed to open so there is no need to close it*/
        }
 }