yaffs Fixed some more bugs in direct/timothy_tests/mirror_tests
[yaffs2.git] / direct / timothy_tests / mirror_tests / mirror_tests.c
index 758b0a9c391fca85dde01029b01958fc4d6dfa6b..bcd9df53ab79d46853b1a9588498e19c94ea9bba 100644 (file)
@@ -68,7 +68,7 @@ int main(int argc, char *argv[])
        print_message(3,message);
 
        run_random_test(num_of_random_tests);
-       compare_linux_and_yaffs();
+       //compare_linux_and_yaffs();
        yaffs_unmount("yaffs2");
        return 0;
 }
@@ -80,7 +80,10 @@ void init(int argc, char *argv[])
        int x=-1;
        char message[100];
 
-       srand((unsigned)time(NULL));
+       x=(unsigned)time(NULL);
+       sprintf(message,"seeding srand with: %d\n",x);
+       print_message(2,message);
+       srand(x);
        yaffs_set_trace(0);
        linux_struct.type_of_test =LINUX;
        yaffs_struct.type_of_test =YAFFS;
@@ -179,11 +182,16 @@ int run_random_test(int num_of_random_tests)
                        print_message(3,message);
                        generate_random_numbers(&args_struct);
                        run_yaffs_test(test_id, &args_struct);
+
+                               //check_mode(&args_struct);
+                       
                        run_linux_test(test_id, &args_struct);
+
                        if (get_print_level()>=4){
                                get_error_yaffs();
                                get_error_linux();
                        }
+                       
                        if      ((abs(yaffs_get_error())!=abs(errno)) &&
                                (abs(yaffs_get_error())!=EISDIR && abs(errno) != 0) &&
                                (abs(yaffs_get_error())!=ENOENT && abs(errno) != EACCES)&&
@@ -196,9 +204,13 @@ int run_random_test(int num_of_random_tests)
                                        exit(0);
                                }
                        }
-               }       
-               compare_linux_and_yaffs();
+               }
+               //check_mode(&args_struct);     
+               compare_linux_and_yaffs(&args_struct);
+               //check_mode(&args_struct);
+
        } 
+       //compare_linux_and_yaffs(&args_struct);
 }
 
 int select_test_id(int test_len)
@@ -211,25 +223,85 @@ int select_test_id(int test_len)
 
 }
 
-int compare_linux_and_yaffs(void)
+int check_mode(arg_temp *args_struct)
+{
+       char path[200];
+       char message[200];
+       int output=0;
+
+       struct yaffs_stat yaffs_stat_struct;
+       join_paths(yaffs_struct.root_path,args_struct->string1, path );
+       sprintf(message,"\ntrying to stat to: %s\n",path);
+       print_message(3,message);
+       output=yaffs_stat(path,&yaffs_stat_struct);
+       if (output < 0){
+               sprintf(message,"failed to stat the file\n");
+               print_message(3,message);
+               get_error_yaffs();
+       } else {
+               sprintf(message,"stated the file\n");
+               print_message(3,message);
+               sprintf(message," yaffs file mode is %d\n",(yaffs_stat_struct.st_mode & (S_IREAD| S_IWRITE)));
+               print_message(3,message);
+               sprintf(message,"mode S_IREAD %d S_IWRITE %d\n",(yaffs_stat_struct.st_mode & S_IREAD),(yaffs_stat_struct.st_mode & S_IWRITE));
+               print_message(3,message);       
+       }
+       return 1;
+}
+
+int check_mode_file(char *path)
+{
+       char message[200];
+       int output=0;
+
+       struct yaffs_stat yaffs_stat_struct;
+
+       sprintf(message,"\ntrying to stat to: %s\n",path);
+       print_message(3,message);
+       output=yaffs_stat(path,&yaffs_stat_struct);
+       if (output < 0){
+               sprintf(message,"failed to stat the file\n");
+               print_message(3,message);
+               get_error_yaffs();
+       } else {
+               sprintf(message,"stated the file\n");
+               print_message(3,message);
+               sprintf(message," yaffs file mode is %d\n",(yaffs_stat_struct.st_mode & (S_IREAD| S_IWRITE)));
+               print_message(3,message);
+               sprintf(message,"mode S_IREAD %d S_IWRITE %d\n\n",(yaffs_stat_struct.st_mode & S_IREAD),(yaffs_stat_struct.st_mode & S_IWRITE));
+               print_message(3,message);       
+       }
+       return 1;
+}
+
+int compare_linux_and_yaffs(arg_temp *args_struct)
 {
        int x=0,y=0;
+       char l_path[200];
+       char y_path[200];
+       char file_name[200];
        int exit_bool=0;
        int number_of_files_in_yaffs=0;
        int number_of_files_in_linux=0;
        char message[200];
 
+       struct yaffs_stat yaffs_stat_struct;
+       struct stat linux_stat_struct;
        yaffs_DIR *yaffs_open_dir;
        yaffs_dirent *yaffs_current_file;
        
        DIR *linux_open_dir;
        struct dirent *linux_current_file;
        
-       print_message(2,"\n\n comparing folders\n");
-
-
+       l_path[0]='\0';
+       y_path[0]='\0';
+       file_name[0]='\0';
+       message[0]='\0';
+       print_message(2,"\n\n\n comparing folders\n");
+//     check_mode_file("yaffs2/test/YY");
+       //find out the number of files in the directory
        yaffs_open_dir = yaffs_opendir(yaffs_struct.root_path);
-       if (yaffs_open_dir) {
+       if (yaffs_open_dir != NULL) {
                for (x=0;NULL!=yaffs_readdir(yaffs_open_dir);x++){}
                number_of_files_in_yaffs=x;
                sprintf(message,"number of files in yaffs dir= %d\n",number_of_files_in_yaffs);
@@ -238,25 +310,30 @@ int compare_linux_and_yaffs(void)
        } else {
                print_message(3,"failed to open yaffs test dir\n");
        }
+       //create array
        char yaffs_file_list[x][200];
 
-
-       if (yaffs_open_dir){
-       
+       //check_mode_file("yaffs2/test/YY");
+       //copy file names into array
+       if (yaffs_open_dir !=NULL){
+               yaffs_current_file =yaffs_readdir(yaffs_open_dir);
                for (x=0 ;NULL!=yaffs_current_file;x++)
                {
-                       yaffs_current_file =yaffs_readdir(yaffs_open_dir);
+
                        if (NULL!=yaffs_current_file){
                                strcpy(yaffs_file_list[x],yaffs_current_file->d_name);
                        }
+                       yaffs_current_file =yaffs_readdir(yaffs_open_dir);
                }
                yaffs_closedir(yaffs_open_dir);
        } else {
                print_message(3,"failed to populate yaffs test list\n");
        }
 
+
+       //find out the number of files in the directory
        linux_open_dir = opendir(linux_struct.root_path);
-       if (linux_open_dir){
+       if (linux_open_dir!=NULL){
                for (x=0;NULL!=readdir(linux_open_dir);x++){}
                number_of_files_in_linux=x-2;
                sprintf(message,"number of files in linux dir= %d\n",(number_of_files_in_linux));
@@ -267,29 +344,35 @@ int compare_linux_and_yaffs(void)
        } else {
                print_message(3,"failed to open linux test dir\n");
        }
+
+       //create array
        char linux_file_list[x-2][200];
-       if (linux_open_dir){
+       //check_mode_file("yaffs2/test/YY");
+       //copy file names into array
+       if (linux_open_dir!=NULL){
+               linux_current_file =readdir(linux_open_dir);
                for (x=0, y=0 ;NULL!=linux_current_file;x++)
                {
-                       linux_current_file =readdir(linux_open_dir);
+
                        if (NULL!=linux_current_file){
                                strcpy(message,linux_current_file->d_name);
-                               print_message(3,"opened file: ");
-                               print_message(3,message);
-                               print_message(3,"\n");
+                               print_message(7,"opened file: ");
+                               print_message(7,message);
+                               print_message(7,"\n");
                        }
                        if (NULL!=linux_current_file && 
                                0!=strcmp(message,".")&&
                                0!=strcmp(message,"..")){
-                       //      strcpy(message,linux_current_file->d_name);
+                               strcpy(file_name,linux_current_file->d_name);
                                //sprintf("file opened: %s\n",linux_current_file->d_name);
                                //print_message(3,message);
-                               print_message(3,"added file to list\n");
-                               strcpy(linux_file_list[y],message);
+                               print_message(7,"added file to list\n");
+                               strcpy(linux_file_list[y],file_name);
                                y++;
                                sprintf(message,"file added to list: %s\n",linux_file_list[x]);
-                               print_message(3,message);
+                               print_message(7,message);
                        }
+                       linux_current_file =readdir(linux_open_dir);
                }
                closedir(linux_open_dir);
        } else {
@@ -297,19 +380,48 @@ int compare_linux_and_yaffs(void)
        }
        
 
-
+       //match the files in both folders
        for (x=0;x<number_of_files_in_yaffs;x++){
-               sprintf(message,"searching for yaffs file: %s\n",yaffs_file_list[x]);
+               sprintf(message,"\nsearching for yaffs file: %s\n",yaffs_file_list[x]);
                print_message(3,message);
                for (y=0;y<number_of_files_in_linux;y++){
                        sprintf(message,"comparing to linux file: %s\n",linux_file_list[y]);
-                       print_message(3,message);
+                       print_message(7,message);
 
                        if (0==strcmp(yaffs_file_list[x],linux_file_list[y])){
                                sprintf(message,"file matched: %s\n",linux_file_list[y]);
                                print_message(3,message);
-                               linux_file_list[y][0]=NULL;
-                               yaffs_file_list[x][0]=NULL;
+                               //check that the modes of both files are the same
+                               join_paths(yaffs_struct.root_path,yaffs_file_list[x],y_path);
+                               join_paths(linux_struct.root_path,linux_file_list[y],l_path);
+                               if (yaffs_stat(y_path,&yaffs_stat_struct)>=0&&
+                               stat(l_path,&linux_stat_struct)>=0){
+                                       sprintf(message," yaffs file mode is %d\n",(yaffs_stat_struct.st_mode & (S_IREAD| S_IWRITE)));
+                                       print_message(3,message);
+                                       sprintf(message,"mode S_IREAD %d S_IWRITE %d\n",(yaffs_stat_struct.st_mode & S_IREAD),(yaffs_stat_struct.st_mode & S_IWRITE));
+                                       print_message(3,message);                               
+                                       sprintf(message," linux file mode is %d\n",(linux_stat_struct.st_mode & (S_IREAD|S_IWRITE)));
+                                       print_message(3,message);
+                                       sprintf(message,"mode S_IREAD %d S_IWRITE %d\n",(linux_stat_struct.st_mode & S_IREAD),(linux_stat_struct.st_mode & S_IWRITE));
+                                       print_message(3,message);
+                                       if ((yaffs_stat_struct.st_mode & (S_IREAD| S_IWRITE))==
+                                       ( linux_stat_struct.st_mode & (S_IREAD|S_IWRITE))){
+                                               print_message(2,"file modes match\n");
+                                       } else {
+                                               print_message(2,"file modes do not match\n");
+                                               exit_bool=1;
+                                       }
+                                       linux_file_list[y][0]=NULL;
+                                       yaffs_file_list[x][0]=NULL;
+                               } else {
+                                       print_message(2,"failed to stat one of the files\n");
+                                       get_error_yaffs();
+                                       get_error_linux();
+                               }
+                               
+                               //read file contents
+                               
+                               
                                break;
                        }
                }
@@ -330,11 +442,10 @@ int compare_linux_and_yaffs(void)
                        exit_bool=1;
                }
        }
-       if (exit_bool==1){
+       if (exit_bool==1&& get_exit_on_error()==1){
                print_message(2,"exiting program\n");
                exit(0);
        }
-
        //printf("file_name %s\n", yaffs_current_file->d_name);
 //     generate_array_of_objects_in_yaffs(); 
 //     generate_array_of_objects_in_linux();
@@ -393,33 +504,6 @@ void run_linux_test(int id,arg_temp *args_struct)
        }
 }
 
-void get_error_yaffs(void)
-{
-       int error_code=0;
-       char message[30];
-       message[0]='\0';
-
-       error_code=yaffs_get_error();
-       sprintf(message,"yaffs_error code %d\n",error_code);
-       print_message(1,message);
-       sprintf(message,"error is : %s\n",yaffs_error_to_str(error_code));
-       print_message(1,message);
-}
-
-void get_error_linux(void)
-{
-       int error_code=0;
-       char message[30];
-       message[0]='\0';
-
-       error_code=errno;
-       sprintf(message,"linux_error code %d\n",error_code);
-       print_message(1,message);
-       strcpy(message,"error code");
-       sprintf(message,"error is : %s\n",yaffs_error_to_str(error_code));
-       //perror(message);      
-       print_message(1,message);
-}
 
 void clean_dir(void)
 {