Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2
[yaffs2.git] / direct / timothy_tests / mirror_tests / mirror_tests.c
index 6e2c33e6870111270631bce45c15ec3fb0117ef3..8c7574e4a2269267c43fe03ed7b02adb7d86d410 100644 (file)
@@ -183,10 +183,10 @@ int run_random_test(int num_of_random_tests)
                        generate_random_numbers(&args_struct);
                        run_yaffs_test(test_id, &args_struct);
 
-                               check_mode(&args_struct);
+                               //check_mode(&args_struct);
                        
                        run_linux_test(test_id, &args_struct);
-                       check_mode(&args_struct);
+
                        if (get_print_level()>=4){
                                get_error_yaffs();
                                get_error_linux();
@@ -205,9 +205,9 @@ int run_random_test(int num_of_random_tests)
                                }
                        }
                }
-               check_mode(&args_struct);       
+               //check_mode(&args_struct);     
                compare_linux_and_yaffs(&args_struct);
-               check_mode(&args_struct);
+               //check_mode(&args_struct);
 
        } 
        compare_linux_and_yaffs(&args_struct);
@@ -249,13 +249,43 @@ int check_mode(arg_temp *args_struct)
        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];
+       char **yaffs_file_list=NULL;
+       char **linux_file_list=NULL;
 
        struct yaffs_stat yaffs_stat_struct;
        struct stat linux_stat_struct;
@@ -265,12 +295,16 @@ int compare_linux_and_yaffs(arg_temp *args_struct)
        DIR *linux_open_dir;
        struct dirent *linux_current_file;
        
-       print_message(2,"\n\n comparing folders\n");
-       check_mode(&args_struct);
-
+       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) {
-               for (x=0;NULL!=yaffs_readdir(yaffs_open_dir);x++){}
+               for (x=0;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);
                print_message(2,message);
@@ -278,27 +312,37 @@ int compare_linux_and_yaffs(arg_temp *args_struct)
        } else {
                print_message(3,"failed to open yaffs test dir\n");
        }
-       char yaffs_file_list[x][200];
-       check_mode(&args_struct);
+       //create array
+       yaffs_file_list= (char **)malloc(x*sizeof(char*));
+       for (x=0;x<number_of_files_in_yaffs;x++) {
+               yaffs_file_list[x]=malloc(200);
+       }
 
+       //check_mode_file("yaffs2/test/YY");
+       //copy file names into array
        if (yaffs_open_dir){
-       
-               for (x=0 ;NULL!=yaffs_current_file;x++)
+               yaffs_current_file =yaffs_readdir(yaffs_open_dir);
+               for (x=0 ;yaffs_current_file;x++)
                {
-                       yaffs_current_file =yaffs_readdir(yaffs_open_dir);
-                       if (NULL!=yaffs_current_file){
+                       printf("x= %d \n",x);
+                       printf("yaffs_current_file->d_name = %s\n",yaffs_current_file->d_name);
+                       if (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");
        }
-       check_mode(&args_struct);
+
+
+       //find out the number of files in the directory
        linux_open_dir = opendir(linux_struct.root_path);
        if (linux_open_dir){
-               for (x=0;NULL!=readdir(linux_open_dir);x++){}
-               number_of_files_in_linux=x-2;
+               for (x=0;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));
                print_message(2,message);
                //the -2 is because linux shows 2 extra files which are automaticly created. 
@@ -307,29 +351,40 @@ int compare_linux_and_yaffs(arg_temp *args_struct)
        } else {
                print_message(3,"failed to open linux test dir\n");
        }
-       char linux_file_list[x-2][200];
+
+       //create array
+       linux_file_list= (char **)malloc(number_of_files_in_linux*sizeof(char*));
+       
+       for (x=0;x<number_of_files_in_linux;x++) {
+               linux_file_list[x]=malloc(200);
+       }
+
+       //check_mode_file("yaffs2/test/YY");
+       //copy file names into array
        if (linux_open_dir){
-               for (x=0, y=0 ;NULL!=linux_current_file;x++)
+               linux_current_file =readdir(linux_open_dir);
+               for (x=0, y=0 ;linux_current_file;x++)
                {
-                       linux_current_file =readdir(linux_open_dir);
-                       if (NULL!=linux_current_file){
+
+                       if (linux_current_file){
                                strcpy(message,linux_current_file->d_name);
                                print_message(7,"opened file: ");
                                print_message(7,message);
                                print_message(7,"\n");
                        }
-                       if (NULL!=linux_current_file && 
+                       if (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(7,"added file to list\n");
-                               strcpy(linux_file_list[y],message);
-                               y++;
-                               sprintf(message,"file added to list: %s\n",linux_file_list[x]);
+                               strcpy(linux_file_list[y],file_name);
+                               sprintf(message,"file added to list: %s\n",linux_file_list[y]);
                                print_message(7,message);
+                               y++;
                        }
+                       linux_current_file =readdir(linux_open_dir);
                }
                closedir(linux_open_dir);
        } else {
@@ -337,9 +392,9 @@ int compare_linux_and_yaffs(arg_temp *args_struct)
        }
        
 
-
+       //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]);
@@ -348,9 +403,11 @@ int compare_linux_and_yaffs(arg_temp *args_struct)
                        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);
-                               //check modes of the files
-                               if (yaffs_stat(yaffs_file_list[x],&yaffs_stat_struct)&&
-                               stat(linux_file_list[y],&linux_stat_struct)){
+                               //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));
@@ -366,14 +423,17 @@ int compare_linux_and_yaffs(arg_temp *args_struct)
                                                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
                                
-                               linux_file_list[y][0]=NULL;
-                               yaffs_file_list[x][0]=NULL;
+                               
                                break;
                        }
                }
@@ -381,14 +441,14 @@ int compare_linux_and_yaffs(arg_temp *args_struct)
 
        //print remaining files
        for (x=0;x<number_of_files_in_linux;x++){
-               if (linux_file_list[x][0]!=NULL){
+               if (linux_file_list[x][0]){
                        sprintf(message,"unmatched file in linux: %s\n",linux_file_list[x]);
                        print_message(2,message);
                        exit_bool=1;
                }
        }
        for (x=0;x<number_of_files_in_yaffs;x++){
-               if (yaffs_file_list[x][0]!=NULL){
+               if (yaffs_file_list[x][0]){
                        sprintf(message,"unmatched file in yaffs: %s\n",yaffs_file_list[x]);
                        print_message(2,message);
                        exit_bool=1;
@@ -399,6 +459,17 @@ int compare_linux_and_yaffs(arg_temp *args_struct)
                exit(0);
        }
 
+       for (x=0;x<number_of_files_in_yaffs;x++) {
+               free(yaffs_file_list[x]);
+       }
+       free(yaffs_file_list);
+
+       for (x=0;x<number_of_files_in_linux;x++) {
+               free(linux_file_list[x]);
+       }
+       free(linux_file_list);
+
+
        //printf("file_name %s\n", yaffs_current_file->d_name);
 //     generate_array_of_objects_in_yaffs(); 
 //     generate_array_of_objects_in_linux();
@@ -407,6 +478,7 @@ int compare_linux_and_yaffs(arg_temp *args_struct)
        //read the text of each file and compare them.
        
        //show the diffrences by printing them. 
+       return 1;
 
 }