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=83efcdbb05a3a5126c0ce7de8657c088eeefc42c;hp=d379944d769b4e27d61c1411b71a86edb4fd8aa0;hb=a32621e0d7f5f391e9152cfe710fa6c99ca44c50;hpb=4adb62b1e4338eaa34d02fdcb0c5d99cebea6747 diff --git a/direct/timothy_tests/quick_tests/test_yaffs_stat.c b/direct/timothy_tests/quick_tests/test_yaffs_stat.c index d379944..83efcdb 100644 --- a/direct/timothy_tests/quick_tests/test_yaffs_stat.c +++ b/direct/timothy_tests/quick_tests/test_yaffs_stat.c @@ -13,22 +13,22 @@ #include "test_yaffs_stat.h" -int test_yaffs_stat(void){ +int test_yaffs_stat(void) +{ + char message[20]; int mode=0; int size=0; - mode =yaffs_test_stat_mode(); - + message[0]='\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"); + } else { + print_message("mode did not match expected file mode\n",2); return -1; } - } - else { + } else { mode =-1; } @@ -36,42 +36,40 @@ int test_yaffs_stat(void){ 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"); + } else { + sprintf(message,"file size %d, expected file size %d\n",size,FILE_SIZE); + print_message(message,2); + print_message("mode did not match expected file mode\n",2); return -1; } - } - else { + } else { size =-1; } if ((mode>0) && (size>0)){ return 1; - } - else { - /* a test failed*/ + } else { + /* one of the tests failed*/ return -1; } - } -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 +80,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; } }