X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Ftimothy_tests%2Fquick_tests%2Ftest_yaffs_stat.c;h=d379944d769b4e27d61c1411b71a86edb4fd8aa0;hp=d47fd2912cdf79de81a98b1d47be32b78e851d12;hb=4f90d524e3c666c53ae36ad2911e00e5b3741cca;hpb=a11dd4924d16a4c3d6df13a4182f7729a1478a53 diff --git a/direct/timothy_tests/quick_tests/test_yaffs_stat.c b/direct/timothy_tests/quick_tests/test_yaffs_stat.c index d47fd29..d379944 100644 --- a/direct/timothy_tests/quick_tests/test_yaffs_stat.c +++ b/direct/timothy_tests/quick_tests/test_yaffs_stat.c @@ -17,26 +17,38 @@ int test_yaffs_stat(void){ int mode=0; int size=0; mode =yaffs_test_stat_mode(); - printf("\nmode %o\n",mode); - printf("expected mode %o \n",FILE_MODE); - printf("anding together %o\n",FILE_MODE & mode); - printf("%d\n",FILE_MODE == (FILE_MODE & mode)); - if (FILE_MODE == (FILE_MODE & mode)){ - mode=1; + + if (mode>=0){ + + if (FILE_MODE == (FILE_MODE & mode)){ + mode=1; + } + else { + printf("mode did not match expected file mode\n"); + return -1; + } } else { - printf("mode did not match expected file mode\n"); - return -1; + mode =-1; } - if (yaffs_test_stat_size()==FILE_SIZE){ - size=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 { - printf("mode did not match expected file mode\n"); - return -1; - } - - if (mode && size){ + size =-1; + } + + + if ((mode>0) && (size>0)){ return 1; } else { @@ -54,12 +66,12 @@ int yaffs_test_stat_mode(void){ struct yaffs_stat stat; int output=0; output=yaffs_stat(FILE_PATH, &stat); - printf("output: %d\n",output); + //printf("output: %d\n",output); if (output>=0){ return stat.st_mode; } else { - printf("failed to stat file\n") ; + printf("failed to stat file mode\n") ; return -1; } } @@ -72,7 +84,7 @@ int yaffs_test_stat_size(void){ return stat.st_size; } else { - printf("failed to stat file\n") ; + printf("failed to stat file size\n") ; return -1; } }