yaffs Have revised and checked each test in quick tests.

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

diff --git a/direct/timothy_tests/quick_tests/quick_tests.c b/direct/timothy_tests/quick_tests/quick_tests.c
index 720fdee55a7dceaf3a67a7955f077f57ae65d47c..17bce3b7321eddd6e4f52904ad2fb2c1fd313523 100644 (file)
--- a/direct/timothy_tests/quick_tests/quick_tests.c
+++ b/direct/timothy_tests/quick_tests/quick_tests.c
@@ -27,45 +27,46 @@ static unsigned int total_number_of_tests=(sizeof(test_list)/sizeof(test_templat
 
 int main(){
        int output=0;
-
+       char message[30];
+       message[0]='\0';
 
        unsigned int x=0;       
        init_quick_tests();
-       printf("\n\nrunning quick tests for yaffs\n\n");
+       print_message("\n\nrunning quick tests for yaffs\n\n", 0);
        //printf("testing yaffs\n");
 
        //printf("len function %d",(sizeof(test_list)/sizeof(test_template)));
        for (x=0;x<total_number_of_tests;x++){
                //printf("x %d\n",x);
                yaffs_set_error(0);     /*reset the last error to 0 */
-               printf("\nrunning test: %s \n",test_list[x].name_of_test);
+               sprintf(message,"\nrunning test: %s \n",test_list[x].name_of_test);
+               print_message(message,2);
                output=test_list[x].p_function();       /*run test*/
                if (output>=0){
                        /*test has passed*/
-                       printf("\ttest %s passed\n",test_list[x].name_of_test); 
+                       sprintf(message,"\ttest %s passed\n",test_list[x].name_of_test);
+                       print_message(message,2); 
                        num_of_tests_pass++;
-               }
-               else {
+               } else {
                        /*test is assumed to have failed*/
                        //printf("test failed\n");
-                       printf("test: %s failed\n",test_list[x].name_of_test);          
+                       sprintf(message,"test: %s failed\n",test_list[x].name_of_test);
+                       print_message(message,1);               
                        num_of_tests_failed ++; 
-
-                       if (EXIT_ON_ERROR){
-                               get_error();
-                               printf("\n\n");
+               
+                       get_error();
+                       print_message("\n\n",1);
+                       if (EXIT_ON_ERROR){     
                                quit_quick_tests(1);
                        }
-                       else {
-                               get_error();
-                               printf("\n\n");
-                       }
+
                }
                output=0;
                output=test_list[x].p_function_clean(); /*clean the test*/
                if (output <0){
                        /* if the test failed to clean it's self then */
-                       printf("test: %s failed to clean\n",test_list[x].name_of_test);         
+                       sprintf(message,"test: %s failed to clean\n",test_list[x].name_of_test);
+                       print_message(message,1);               
                        num_of_tests_failed ++; 
                        num_of_tests_pass--;
                        get_error();
@@ -75,34 +76,42 @@ int main(){
                        }
                        
                } else {
-                       printf("\ttest clean: %s passed\n",test_list[x].name_of_test);
+                       sprintf(message,"\ttest clean: %s passed\n",test_list[x].name_of_test);
+                       print_message(message,2);
                }
        }
        /*this is where the loop should break to*/
        quit_quick_tests(0);
-       /* the progame should never get here*/  
-       return 0;
 }
 
-void quit_quick_tests(int exit_code){
-       
+void quit_quick_tests(int exit_code)
+{
+       char message[30];
+       message[0]='\0';        
        if (num_of_tests_pass==total_number_of_tests &&  num_of_tests_failed==0){
                printf("\t OK \n");
        }
-       printf("tests: %d passed %d failed\n\n\n",num_of_tests_pass,num_of_tests_failed);
+       printf("tests: %d passed %d failed out of %d tests\n\n\n",num_of_tests_pass,num_of_tests_failed,total_number_of_tests);
        yaffs_unmount(YAFFS_MOUNT_POINT);
        exit(exit_code);
 }
 
-void get_error(void){
+void get_error(void)
+{
        int error_code=0;
+       char message[30];
+       message[0]='\0';
+
        error_code=yaffs_get_error();
-       printf("yaffs_error code %d\n",error_code);
-       printf("error is : %s\n",yaffs_error_to_str(error_code));
+       sprintf(message,"yaffs_error code %d\n",error_code);
+       print_message(message,1);
+       sprintf(message,"error is : %s\n",yaffs_error_to_str(error_code));
+       print_message(message,1);
 }
 
-void init_quick_tests(void){
-       yaffs_start_up();;
+void init_quick_tests(void)
+{
+       yaffs_start_up();
        yaffs_set_trace(0);
 
 }