yaffs Chasing a bug in yaffsfs.

Signed-off-by: Timothy Manning <tfhmanning@gmail.com>

diff --git a/direct/timothy_tests/quick_tests/Makefile b/direct/timothy_tests/quick_tests/Makefile
index 00ef9f148c0f572bfc8859eb9d0ea3fb2ce86c55..94614fbf34bb471dab96be7ca681e836c53cc673 100644 (file)
--- a/direct/timothy_tests/quick_tests/Makefile
+++ b/direct/timothy_tests/quick_tests/Makefile
@@ -66,7 +66,9 @@ TESTFILES =   quick_tests.o lib.o \
                test_yaffs_fdatasync.o test_yaffs_fdatasync_EBADF.o \
                test_yaffs_mkdir.o test_yaffs_mkdir_EEXIST.o test_yaffs_mkdir_ENOTDIR.o \
                test_yaffs_fchmod.o test_yaffs_fchmod_EBADF.o test_yaffs_fchmod_EINVAL.o \
                test_yaffs_fdatasync.o test_yaffs_fdatasync_EBADF.o \
                test_yaffs_mkdir.o test_yaffs_mkdir_EEXIST.o test_yaffs_mkdir_ENOTDIR.o \
                test_yaffs_fchmod.o test_yaffs_fchmod_EBADF.o test_yaffs_fchmod_EINVAL.o \

-               test_yaffs_symlink.o test_yaffs_symlink_ENOTDIR.o test_yaffs_symlink_EEXIST.o
+               test_yaffs_symlink.o test_yaffs_symlink_ENOTDIR.o test_yaffs_symlink_EEXIST.o test_yaffs_symlink_ENOENT.o \
+               test_yaffs_mount2.o
+

 
                  
 
 
                  
 

diff --git a/direct/timothy_tests/quick_tests/README.txt b/direct/timothy_tests/quick_tests/README.txt
index a1cb4b733211eeb5fe8bf8c5efb1ddccb817f46f..41efeee88f2cefcba83bef8910354340bf92c61b 100644 (file)
--- a/direct/timothy_tests/quick_tests/README.txt
+++ b/direct/timothy_tests/quick_tests/README.txt
@@ -62,6 +62,8 @@ Tests made
 
        test_yaffs_symlink
        test_yaffs_symlink_ENOTDIR
 
        test_yaffs_symlink
        test_yaffs_symlink_ENOTDIR

+       test_yaffs_symlink_EEXISTS
+       test_yaffs_symlink_ENOENT       //if there is a slash on the end of new path

 
        test_yaffs_fstat
        test_yaffs_fstat_EBADF
 
        test_yaffs_fstat
        test_yaffs_fstat_EBADF


@@ -117,12 +119,12 @@ Tests to add
 
 
        test_yaffs_symlink_EACCES
 
 
        test_yaffs_symlink_EACCES

-       test_yaffs_symlink_EEXISTS

        test_yaffs_symlink_ELOOP
        test_yaffs_symlink_ENAMETOOLONG
        test_yaffs_symlink_ELOOP
        test_yaffs_symlink_ENAMETOOLONG

-       test_yaffs_symlink_ENOENT       //if there is a slash on the end

        test_yaffs_symlink_EROFS
 
        test_yaffs_symlink_EROFS
 

+       
+       //the yaffs_mknod function does not exist in yaffsfs, so these tests will be ignored.

        test_yaffs_mknod
        test_yaffs_mknod_EACCES
        test_yaffs_mknod_EEXIST
        test_yaffs_mknod
        test_yaffs_mknod_EACCES
        test_yaffs_mknod_EEXIST

diff --git a/direct/timothy_tests/quick_tests/lib.h b/direct/timothy_tests/quick_tests/lib.h
index b12c04f55da6d4d4a0c5cb411a4a61fe01ecc940..29063123da9f990cf63efdc56a5c723d89a33ee1 100644 (file)
--- a/direct/timothy_tests/quick_tests/lib.h
+++ b/direct/timothy_tests/quick_tests/lib.h
@@ -34,6 +34,8 @@
 
 #define SYMLINK_PATH "/yaffs2/sym_foo"
 
 
 #define SYMLINK_PATH "/yaffs2/sym_foo"
 

+#define NODE_PATH "/yaffs2/node"
+

 /* warning do not define anything as FILE because there seems to be a conflict with stdio.h */ 
 #define FILE_PATH "/yaffs2/foo"
 
 /* warning do not define anything as FILE because there seems to be a conflict with stdio.h */ 
 #define FILE_PATH "/yaffs2/foo"
 

diff --git a/direct/timothy_tests/quick_tests/quick_tests.c b/direct/timothy_tests/quick_tests/quick_tests.c
index d74714dc25d28bf91abb878d122cc2d1f7dc9c1e..f127be7f2b044b37ed60f2cee1e64c23ea43dee8 100644 (file)
--- a/direct/timothy_tests/quick_tests/quick_tests.c
+++ b/direct/timothy_tests/quick_tests/quick_tests.c
@@ -35,7 +35,9 @@ int main(int argc, char *argv[]){
        print_message("\n\nrunning quick tests for yaffs\n\n", 0);
 
        for (x=0;x<total_number_of_tests;x++){
        print_message("\n\nrunning quick tests for yaffs\n\n", 0);
 
        for (x=0;x<total_number_of_tests;x++){

-               //printf("x %d\n",x);
+               output=test_yaffs_open();
+               printf("yaffs_open = %d\n",output);
+               printf("yaffs_open_clean = %d\n",yaffs_close(output));

                yaffs_set_error(0);     /*reset the last error to 0 */
                sprintf(message,"\nrunning test: %s \n",test_list[x].name_of_test);
                print_message(message,3);
                yaffs_set_error(0);     /*reset the last error to 0 */
                sprintf(message,"\nrunning test: %s \n",test_list[x].name_of_test);
                print_message(message,3);

diff --git a/direct/timothy_tests/quick_tests/quick_tests.h b/direct/timothy_tests/quick_tests/quick_tests.h
index c483d8f3ce86c93eb4884df07ecc8f82e3c91aa5..16776c1100f0e0eff8e754e7d5d479aa4df39a16 100644 (file)
--- a/direct/timothy_tests/quick_tests/quick_tests.h
+++ b/direct/timothy_tests/quick_tests/quick_tests.h
@@ -107,7 +107,9 @@
 #include "test_yaffs_symlink.h"
 #include "test_yaffs_symlink_ENOTDIR.h"
 #include "test_yaffs_symlink_EEXIST.h"
 #include "test_yaffs_symlink.h"
 #include "test_yaffs_symlink_ENOTDIR.h"
 #include "test_yaffs_symlink_EEXIST.h"

+#include "test_yaffs_symlink_ENOENT.h"

 
 

+#include "test_yaffs_mount2.h"

 
 #include "yaffsfs.h"
 #include "yaffs_error_converter.h"
 
 #include "yaffsfs.h"
 #include "yaffs_error_converter.h"


@@ -166,7 +168,7 @@ test_template test_list[]={
 
        {test_yaffs_write,test_yaffs_write_clean,"test_yaffs_write"},
        {test_yaffs_write_EBADF,test_yaffs_write_EBADF_clean,"test_yaffs_write_EBADF"},
 
        {test_yaffs_write,test_yaffs_write_clean,"test_yaffs_write"},
        {test_yaffs_write_EBADF,test_yaffs_write_EBADF_clean,"test_yaffs_write_EBADF"},

-       {test_yaffs_write_big_file,test_yaffs_write_big_file_clean,"test_yaffs_write_big_file"},
+//     {test_yaffs_write_big_file,test_yaffs_write_big_file_clean,"test_yaffs_write_big_file"},

 
        {test_yaffs_read,test_yaffs_read_clean,"test_yaffs_read"},
        {test_yaffs_read_EBADF,test_yaffs_read_EBADF_clean,"test_yaffs_read_EBADF"},
 
        {test_yaffs_read,test_yaffs_read_clean,"test_yaffs_read"},
        {test_yaffs_read_EBADF,test_yaffs_read_EBADF_clean,"test_yaffs_read_EBADF"},


@@ -212,7 +214,12 @@ test_template test_list[]={
 
        {test_yaffs_symlink,test_yaffs_symlink_clean,"test_yaffs_symlink"},
        {test_yaffs_symlink_ENOTDIR,test_yaffs_symlink_ENOTDIR_clean,"test_yaffs_symlink_ENOTDIR"},
 
        {test_yaffs_symlink,test_yaffs_symlink_clean,"test_yaffs_symlink"},
        {test_yaffs_symlink_ENOTDIR,test_yaffs_symlink_ENOTDIR_clean,"test_yaffs_symlink_ENOTDIR"},

-       {test_yaffs_symlink_EEXIST,test_yaffs_symlink_EEXIST_clean,"test_yaffs_symlink_EEXIST"}
+       {test_yaffs_symlink_EEXIST,test_yaffs_symlink_EEXIST_clean,"test_yaffs_symlink_EEXIST"},
+       {test_yaffs_symlink_ENOENT,test_yaffs_symlink_ENOENT_clean,"test_yaffs_symlink_ENOENT"},
+
+       {test_yaffs_mount2,test_yaffs_mount2_clean,"test_yaffs_mount2"}
+
+

 
 
 
 
 
 

diff --git a/direct/timothy_tests/quick_tests/test_yaffs_mknode.c b/direct/timothy_tests/quick_tests/test_yaffs_mknode.c
new file mode 100644 (file)
index 0000000..5c6c5ca
--- /dev/null
+++ b/direct/timothy_tests/quick_tests/test_yaffs_mknode.c
@@ -0,0 +1,33 @@
+/*
+ * 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_mknode.h"
+
+static int output = 0;
+
+int test_yaffs_mknode(void)
+{
+       output = yaffs_mknod(NODE_PATH,S_IREAD | S_IWRITE);
+       return output;
+}
+
+
+int test_yaffs_mknode_clean(void)
+{
+       if (output >= 0){
+               return yaffs_unlink(NODE_PATH);
+       } else {
+               return 1;       /* the file failed to open so there is no need to close it */
+       }
+}
+

diff --git a/direct/timothy_tests/quick_tests/test_yaffs_mknode.h b/direct/timothy_tests/quick_tests/test_yaffs_mknode.h
new file mode 100644 (file)
index 0000000..7699141
--- /dev/null
+++ b/direct/timothy_tests/quick_tests/test_yaffs_mknode.h
@@ -0,0 +1,25 @@
+/*
+ * YAFFS: Yet another Flash File System . 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 Lesser General Public License version 2.1 as
+ * published by the Free Software Foundation.
+ *
+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
+ */
+
+#ifndef __test_yaffs_mknode_h__
+#define __test_yaffs_mknode_h__
+
+#include "lib.h"
+#include "yaffsfs.h"
+
+int test_yaffs_mknode(void);
+int test_yaffs_mknode_clean(void);
+
+#endif

diff --git a/direct/timothy_tests/quick_tests/test_yaffs_mount2.c b/direct/timothy_tests/quick_tests/test_yaffs_mount2.c
new file mode 100644 (file)
index 0000000..52728b7
--- /dev/null
+++ b/direct/timothy_tests/quick_tests/test_yaffs_mount2.c
@@ -0,0 +1,33 @@
+/*
+ * 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_mount2.h"
+
+int test_yaffs_mount2(void)
+{
+       int output = -1;
+       printf("closing handle again %d\n",yaffs_close(0));
+       output= yaffs_unmount(YAFFS_MOUNT_POINT);
+       if (output < 0) {
+               print_message("failed to unmount current_mountpoint\n",2);
+               return -1;
+       }
+
+       output = yaffs_mount2(YAFFS_MOUNT_POINT,255);
+       return output;
+}
+
+int test_yaffs_mount2_clean(void)
+{
+       return 1;       
+}

diff --git a/direct/timothy_tests/quick_tests/test_yaffs_mount2.h b/direct/timothy_tests/quick_tests/test_yaffs_mount2.h
new file mode 100644 (file)
index 0000000..4db4342
--- /dev/null
+++ b/direct/timothy_tests/quick_tests/test_yaffs_mount2.h
@@ -0,0 +1,26 @@
+/*
+ * YAFFS: Yet another Flash File System . 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 Lesser General Public License version 2.1 as
+ * published by the Free Software Foundation.
+ *
+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
+ */
+
+#ifndef __test_yaffs_mount2__
+#define __test_yaffs_mount2__
+
+#include "yaffsfs.h"
+#include "lib.h"
+#include "test_yaffs_unmount.h"
+
+int test_yaffs_mount2(void);
+int test_yaffs_mount2_clean(void);
+
+#endif

diff --git a/direct/timothy_tests/quick_tests/test_yaffs_symlink_ENOENT.c b/direct/timothy_tests/quick_tests/test_yaffs_symlink_ENOENT.c
new file mode 100644 (file)
index 0000000..64129b1
--- /dev/null
+++ b/direct/timothy_tests/quick_tests/test_yaffs_symlink_ENOENT.c
@@ -0,0 +1,47 @@
+/*
+ * 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_symlink_ENOENT.h"
+
+static int output = 0;
+
+int test_yaffs_symlink_ENOENT(void)
+{
+       int error_code = 0;
+       output = yaffs_symlink(FILE_PATH,"/yaffs2//");
+       if (output<0){ 
+               error_code=yaffs_get_error();
+               if (abs(error_code)==ENOENT){
+                       return 1;
+               } else {
+                       print_message("returned error does not match the the expected error\n",2);
+                       return -1;
+               }
+       } else {
+               print_message("created a symlink in a non-existing directory (which is a bad thing)\n",2);
+               return -1;
+       }       
+
+}
+
+int test_yaffs_symlink_ENOENT_clean(void)
+{
+       if (output >= 0){
+               return yaffs_unlink(SYMLINK_PATH);
+       } else {
+               return 1;       /* the file failed to open so there is no need to close it */
+       }
+}
+
+
+

diff --git a/direct/timothy_tests/quick_tests/test_yaffs_symlink_ENOENT.h b/direct/timothy_tests/quick_tests/test_yaffs_symlink_ENOENT.h
new file mode 100644 (file)
index 0000000..b6dc53d
--- /dev/null
+++ b/direct/timothy_tests/quick_tests/test_yaffs_symlink_ENOENT.h
@@ -0,0 +1,25 @@
+/*
+ * YAFFS: Yet another Flash File System . 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 Lesser General Public License version 2.1 as
+ * published by the Free Software Foundation.
+ *
+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
+ */
+
+#ifndef __test_yaffs_symlink_ENOENT_h__
+#define __test_yaffs_symlink_ENOENT_h__
+
+#include "lib.h"
+#include "yaffsfs.h"
+
+int test_yaffs_symlink_ENOENT(void);
+int test_yaffs_symlink_ENOENT_clean(void);
+
+#endif

diff --git a/direct/timothy_tests/quick_tests/test_yaffs_truncate_EINVAL.c b/direct/timothy_tests/quick_tests/test_yaffs_truncate_EINVAL.c
index f56045abc085f04a8acb3676da02209242add32b..26c70a1bbbabc44924d64cf3c644110c19619bcd 100644 (file)
--- a/direct/timothy_tests/quick_tests/test_yaffs_truncate_EINVAL.c
+++ b/direct/timothy_tests/quick_tests/test_yaffs_truncate_EINVAL.c
@@ -12,32 +12,28 @@
  */
 
 #include "test_yaffs_truncate_EINVAL.h"
  */
 
 #include "test_yaffs_truncate_EINVAL.h"

-static int handle=-1;
+

 
 int test_yaffs_truncate_EINVAL(void)
 {
        int error=0;
        int output=0;
 
 int test_yaffs_truncate_EINVAL(void)
 {
        int error=0;
        int output=0;

-       handle=test_yaffs_open();
-       if (handle>=0){
-               output= yaffs_truncate("/yaffs2/foo",-1 );
-               if (output<0){
-                       error=yaffs_get_error();
-                       if (abs(error)==EINVAL){
-                               return 1;
-                       } else {
-                               print_message("received a different error than expected\n",2);
-                               return -1;
-                       }
-               } else{
-                       print_message("truncated a file with a bad mode set.\n",2);
+
+       output= yaffs_truncate("/yaffs2/foo",-1 );
+       if (output<0){
+               error=yaffs_get_error();
+               if (abs(error)==EINVAL){
+                       return 1;
+               } else {
+                       print_message("received a different error than expected\n",2);

                        return -1;
                }
                        return -1;
                }

-                       
-       } else {
-               print_message("error opening file",2);
+       } else{
+               print_message("truncated a file with a bad mode set.\n",2);

                return -1;
        }
                return -1;
        }

+                       
+

 }
 
 int test_yaffs_truncate_EINVAL_clean(void)
 }
 
 int test_yaffs_truncate_EINVAL_clean(void)

diff --git a/direct/timothy_tests/quick_tests/test_yaffs_truncate_EISDIR.c b/direct/timothy_tests/quick_tests/test_yaffs_truncate_EISDIR.c
index cfd1d82422388eccc912b55fa9dea93b50b5aa7b..b6bd10fc105d6ec0c851a7711f20ea3f59c7f712 100644 (file)
--- a/direct/timothy_tests/quick_tests/test_yaffs_truncate_EISDIR.c
+++ b/direct/timothy_tests/quick_tests/test_yaffs_truncate_EISDIR.c
@@ -18,26 +18,22 @@ int test_yaffs_truncate_EISDIR(void)
 {
        int error = 0;
        int output = 0;
 {
        int error = 0;
        int output = 0;

-       handle = test_yaffs_open();
-       if (handle>=0){
-               output = yaffs_truncate("/yaffs2/",10);
-               if (output < 0){
-                       error = yaffs_get_error();
-                       if (abs(error) == EISDIR){
-                               return 1;
-                       } else {
-                               print_message("received a different error than expected\n",2);
-                               return -1;
-                       }
-               } else{
-                       print_message("truncated a directory\n",2);
+
+
+       output = yaffs_truncate("/yaffs2/",10);
+       if (output < 0){
+               error = yaffs_get_error();
+               if (abs(error) == EISDIR){
+                       return 1;
+               } else {
+                       print_message("received a different error than expected\n",2);

                        return -1;
                }
                        return -1;
                }

-                       
-       } else {
-               print_message("error opening file\n",2);
-               return 1;
+       } else{
+               print_message("truncated a directory\n",2);
+               return -1;

        }
        }

+

 }
 
 int test_yaffs_truncate_EISDIR_clean(void)
 }
 
 int test_yaffs_truncate_EISDIR_clean(void)

diff --git a/direct/timothy_tests/quick_tests/test_yaffs_truncate_ENOENT.c b/direct/timothy_tests/quick_tests/test_yaffs_truncate_ENOENT.c
index 72d7314079a46a95925e9b8815f4bf3f43ab63fd..21b2873c273eaaf1d12c59fb3466e919ce42f0e6 100644 (file)
--- a/direct/timothy_tests/quick_tests/test_yaffs_truncate_ENOENT.c
+++ b/direct/timothy_tests/quick_tests/test_yaffs_truncate_ENOENT.c
@@ -12,32 +12,28 @@
  */
 
 #include "test_yaffs_truncate_ENOENT.h"
  */
 
 #include "test_yaffs_truncate_ENOENT.h"

-static int handle = -1;
+

 
 int test_yaffs_truncate_ENOENT(void)
 {
        int error=0;
        int output=0;
 
 
 int test_yaffs_truncate_ENOENT(void)
 {
        int error=0;
        int output=0;
 

-       handle=test_yaffs_open();
-       if (handle>=0){
-               output= yaffs_truncate("/yaffs2/non_existing_file",FILE_SIZE_TRUNCATED );
-               if (output<0){
-                       error=yaffs_get_error();
-                       if (abs(error)==ENOENT){
-                               return 1;
-                       } else {
-                               print_message("received a different error than expected\n",2);
-                               return -1;
-                       }
-               } else{
-                       print_message("truncated a nonexisting file\n",2);
+
+       output= yaffs_truncate("/yaffs2/non_existing_file",FILE_SIZE_TRUNCATED );
+       if (output<0){
+               error=yaffs_get_error();
+               if (abs(error)==ENOENT){
+                       return 1;
+               } else {
+                       print_message("received a different error than expected\n",2);

                        return -1;
                        return -1;

-               }               
-       } else {
-               print_message("error opening file",2);
+               }
+       } else{
+               print_message("truncated a nonexisting file\n",2);

                return -1;
                return -1;

-       }
+       }               
+

 }
 
 int test_yaffs_truncate_ENOENT_clean(void)
 }
 
 int test_yaffs_truncate_ENOENT_clean(void)

diff --git a/direct/timothy_tests/quick_tests/test_yaffs_truncate_ENOTDIR.c b/direct/timothy_tests/quick_tests/test_yaffs_truncate_ENOTDIR.c
index c2414db43711800cf3373c94d81bf65f754620fe..d8ef1555905b6204b9f66c7bcd1428e28dc479b3 100644 (file)
--- a/direct/timothy_tests/quick_tests/test_yaffs_truncate_ENOTDIR.c
+++ b/direct/timothy_tests/quick_tests/test_yaffs_truncate_ENOTDIR.c
@@ -13,30 +13,25 @@
 
 #include "test_yaffs_truncate_ENOTDIR.h"
 
 
 #include "test_yaffs_truncate_ENOTDIR.h"
 

-static int handle = -1;
+

 
 int test_yaffs_truncate_ENOTDIR(void)
 {
        int error=0;
        int output=0;
 
 int test_yaffs_truncate_ENOTDIR(void)
 {
        int error=0;
        int output=0;

-       handle=test_yaffs_open();
-       if (handle>=0){
-               output= yaffs_truncate("/non_existing_dir/foo",FILE_SIZE_TRUNCATED );
-               if (output<0){
-                       error=yaffs_get_error();
-                       if (abs(error)==ENOTDIR){
-                               return 1;
-                       } else {
-                               print_message("received a different error than expected\n",2);
-                               return -1;
-                       }
-               } else{
-                       print_message("truncated a nonexisting file\n",2);
+
+
+       output= yaffs_truncate("/non_existing_dir/foo",FILE_SIZE_TRUNCATED );
+       if (output<0){
+               error=yaffs_get_error();
+               if (abs(error)==ENOTDIR){
+                       return 1;
+               } else {
+                       print_message("received a different error than expected\n",2);

                        return -1;
                }
                        return -1;
                }

-                       
-       } else {
-               print_message("error opening file\n",2);
+       } else{
+               print_message("truncated a nonexisting file\n",2);

                return -1;
        }
 }
                return -1;
        }
 }

diff --git a/direct/timothy_tests/quick_tests/test_yaffs_truncate_big_file.c b/direct/timothy_tests/quick_tests/test_yaffs_truncate_big_file.c
index 270bf49846774d3ca78c0410ad9be70dc659d805..7ec30cfe66b5d8fe4afe81bedfe1b2811310a527 100644 (file)
--- a/direct/timothy_tests/quick_tests/test_yaffs_truncate_big_file.c
+++ b/direct/timothy_tests/quick_tests/test_yaffs_truncate_big_file.c
@@ -12,32 +12,28 @@
  */
 
 #include "test_yaffs_truncate_big_file.h"
  */
 
 #include "test_yaffs_truncate_big_file.h"

-static int handle = -1;
+

 
 int test_yaffs_truncate_big_file(void)
 {
        int error=0;
        int output=0;
 
 int test_yaffs_truncate_big_file(void)
 {
        int error=0;
        int output=0;

-       handle=test_yaffs_open();
-       if (handle>=0){
-               output= yaffs_truncate("/yaffs2/foo",10000000000000000000000000000000000000000000 );
-               if (output<0){
-                       error=yaffs_get_error();
-                       if (abs(error)==EINVAL){        /*in yaffs EINVAL is used instead of big_file */
-                               return 1;
-                       } else {
-                               print_message("received a different error than expected\n",2);
-                               return -1;
-                       }
-               } else{
-                       print_message("truncated a file to a massive size\n",2);
+
+       output= yaffs_truncate("/yaffs2/foo",10000000000000000000000000000000000000000000 );
+       if (output<0){
+               error=yaffs_get_error();
+               if (abs(error)==EINVAL){        /*in yaffs EINVAL is used instead of big_file */
+                       return 1;
+               } else {
+                       print_message("received a different error than expected\n",2);

                        return -1;
                }
                        return -1;
                }

-                       
-       } else {
-               print_message("error opening file\n",2);
+       } else{
+               print_message("truncated a file to a massive size\n",2);

                return -1;
        }
                return -1;
        }

+                       
+

 }
 
 int test_yaffs_truncate_big_file_clean(void)
 }
 
 int test_yaffs_truncate_big_file_clean(void)

diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unlink.c b/direct/timothy_tests/quick_tests/test_yaffs_unlink.c
index 75cf7c0f76eb29ae1d812d60c087268e0b36dc12..4436da6ceaf209f7a3e142278cb3facfbb1cc3ed 100644 (file)
--- a/direct/timothy_tests/quick_tests/test_yaffs_unlink.c
+++ b/direct/timothy_tests/quick_tests/test_yaffs_unlink.c
@@ -26,5 +26,5 @@ int test_yaffs_unlink(void)
 
 int test_yaffs_unlink_clean(void)
 {
 
 int test_yaffs_unlink_clean(void)
 {

-       return test_yaffs_open();
+       return test_yaffs_open()||test_yaffs_open_clean();

 }
 }