Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2

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

diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unlink_ENOTDIR.c b/direct/timothy_tests/quick_tests/test_yaffs_unlink_ENOTDIR.c
index 8724376fb7a5c89498a0e52ae5d34a4cda59fbf8..e75d12164e96fb17692c3d2c6725503b332af1c7 100644 (file)
--- a/direct/timothy_tests/quick_tests/test_yaffs_unlink_ENOTDIR.c
+++ b/direct/timothy_tests/quick_tests/test_yaffs_unlink_ENOTDIR.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>
@@ -14,30 +14,29 @@
 #include "test_yaffs_open_ENOTDIR.h"
 
 
-int test_yaffs_unlink_ENOTDIR(void){
+int test_yaffs_unlink_ENOTDIR(void)
+{
        int output=0;
        int error_code=0;
-       /*printf("path %s\n",path); */
-       output=yaffs_unlink("/nonexisting_dir/foo");
+
+       output=yaffs_unlink("/yaffs2/foo/file");
        if (output==-1){
                error_code=yaffs_get_error();
-               //printf("EISDIR def %d, Error code %d\n", ENOTDIR,error_code);
                if (abs(error_code)==ENOTDIR){
                        return 1;
-               }
-               else {
-                       printf("different error than expected\n");
+               } else {
+                       print_message("different error than expected\n",2);
                        return -1;
                }
-       }
-       else {
-               printf("non existant directory opened.(which is a bad thing)\n");
+       } else {
+               print_message("non existant directory opened.(which is a bad thing)\n",2);
                return -1;
        }
 
 
 }
-int test_yaffs_unlink_ENOTDIR_clean(void){
+int test_yaffs_unlink_ENOTDIR_clean(void)
+{
        return 1;
 }