Update timothy test Makefile

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

diff --git a/direct/timothy_tests/quick_tests/test_yaffs_stat.c b/direct/timothy_tests/quick_tests/test_yaffs_stat.c
index d379944d769b4e27d61c1411b71a86edb4fd8aa0..f3aa8f75a33bd475fcf4e35270539689905c53d3 100644 (file)
--- a/direct/timothy_tests/quick_tests/test_yaffs_stat.c
+++ b/direct/timothy_tests/quick_tests/test_yaffs_stat.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>
@@ -13,65 +13,32 @@
 
 #include "test_yaffs_stat.h"
 
-int test_yaffs_stat(void){
+int test_yaffs_stat(void)
+{
+       char message[100];
        int mode=0;
        int size=0;
-       mode =yaffs_test_stat_mode();
-       
-       if (mode>=0){
-       
-               if (FILE_MODE == (FILE_MODE & mode)){
-                       mode=1;
-               }
-               else {
-                       printf("mode did not match expected file mode\n");
-                       return -1;
-               }
-       }
-       else {
-               mode =-1;
-       }
-
-       size=yaffs_test_stat_size();
-       if (size >=0){
-               if (size==FILE_SIZE){
-                       size=1;
-               }
-               else {
-                       printf("file size %d, expected file size %d\n",size,FILE_SIZE);
-                       printf("mode did not match expected file mode\n");
-                       return -1;
-               }
-       }
-       else {
-               size =-1;
-       }       
-
-
-       if ((mode>0) && (size>0)){
-               return 1;
-       }
-       else {
-               /* a test failed*/
-               return -1;
-       }
+       message[0]='\0';
+       struct yaffs_stat stat;
 
+       return yaffs_stat(FILE_PATH, &stat);
 }
 
-int test_yaffs_stat_clean(void){
+int test_yaffs_stat_clean(void)
+{
        return 1;
 }
 
-int yaffs_test_stat_mode(void){
+int yaffs_test_stat_mode(void)
+{
        struct yaffs_stat stat;
        int output=0;
        output=yaffs_stat(FILE_PATH, &stat);
        //printf("output: %d\n",output);
        if (output>=0){
                return stat.st_mode;    
-       }
-       else {
-               printf("failed to stat file mode\n") ;
+       } else {
+               print_message("failed to stat file mode\n",2) ;
                return -1;
        }
 }
@@ -82,9 +49,8 @@ int yaffs_test_stat_size(void){
        output=yaffs_stat(FILE_PATH, &stat); 
        if (output>=0){
                return stat.st_size;    
-       }
-       else {
-               printf("failed to stat file size\n") ;
+       } else {
+               print_message("failed to stat file size\n",2) ;
                return -1;
        }
 }