X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Ftimothy_tests%2Fquick_tests%2Fquick_tests.c;h=a3f6463304d3ec866645db8e413ee90fb8dd83ee;hp=a943f4d3bce1938c0e7406779721326351f76b67;hb=6648cbf52d6695755941ff8607fd7a0cda542e05;hpb=3b5f00f58cc6387ada64dd3a19c220ee1403e55e diff --git a/direct/timothy_tests/quick_tests/quick_tests.c b/direct/timothy_tests/quick_tests/quick_tests.c index a943f4d..a3f6463 100644 --- a/direct/timothy_tests/quick_tests/quick_tests.c +++ b/direct/timothy_tests/quick_tests/quick_tests.c @@ -1,7 +1,7 @@ /* * YAFFS: Yet another FFS. A NAND-flash specific file system. * - * Copyright (C) 2002-2010 Aleph One Ltd. + * Copyright (C) 2002-2011 Aleph One Ltd. * for Toby Churchill Ltd and Brightstar Engineering * * Created by Timothy Manning @@ -20,68 +20,107 @@ int simulate_power_failure = 0; - +static int number_of_random_tests=0; static unsigned int num_of_tests_pass=0; static unsigned int num_of_tests_failed=0; static unsigned int total_number_of_tests=(sizeof(test_list)/sizeof(test_template)); -int main(int argc, char *argv[]){ - int output=0; - char message[30]; - message[0]='\0'; - unsigned int x=0; + +const struct option long_options[]={ + {"help", 0,NULL,'h'}, + {"quiet", 0,NULL,'q'}, + {"number", 1,NULL,'n'}, + {"trace", 1,NULL,'t'}, + {"continue", 0,NULL,'c'}, + {"verbose", 0,NULL,'v'} +}; + +const char short_options[]="hqn:t:cv"; + + + +int main(int argc, char *argv[]) +{ + int x=0; init_quick_tests(argc, argv); + logical_run_of_tests(); + for (x=0;x=0){ - /*test has passed*/ - sprintf(message,"\ttest %s passed\n",test_list[x].name_of_test); - print_message(message,3); - num_of_tests_pass++; - } else { - /*test is assumed to have failed*/ - //printf("test failed\n"); - sprintf(message,"test: %s failed\n",test_list[x].name_of_test); - print_message(message,1); - num_of_tests_failed ++; - - get_error(); - print_message("\n\n",1); - if (get_exit_on_error()){ - quit_quick_tests(1); - } + run_test(x); + } +} + +void run_test(int x) +{ + int output=0; + char message[200]; + message[0]='\0'; + yaffs_set_error(0); /*reset the last error to 0 */ + //printf("foo exists %d\n",test_yaffs_open()); + sprintf(message,"\nrunning test: %s \n",test_list[x].name_of_test); + print_message(message,3); + output=test_list[x].p_function(); /*run test*/ + if (output>=0){ + /*test has passed*/ + sprintf(message,"\ttest %s passed\n",test_list[x].name_of_test); + print_message(message,3); + num_of_tests_pass++; + } else { + /*test is assumed to have failed*/ + //printf("test failed\n"); + sprintf(message,"test: %s failed\n",test_list[x].name_of_test); + print_message(message,1); + num_of_tests_failed ++; + + get_error(); + print_message("\n\n",1); + if (get_exit_on_error()){ + quit_quick_tests(1); } - 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 */ - 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(); - printf("\n\n"); - if (get_exit_on_error()){ - quit_quick_tests(1); - } - - } else { - sprintf(message,"\ttest clean: %s passed\n",test_list[x].name_of_test); - print_message(message,3); + } + 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 */ + 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(); + printf("\n\n"); + if (get_exit_on_error()){ + quit_quick_tests(1); } + + } else { + sprintf(message,"\ttest clean: %s passed\n",test_list[x].name_of_test); + print_message(message,3); } - /*this is where the loop should break to*/ - quit_quick_tests(0); } void quit_quick_tests(int exit_code) @@ -89,7 +128,7 @@ 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("\t OK --all tests passed\n"); } printf("out of %d tests, %d ran: %d passed and %d failed\n\n\n", total_number_of_tests,(num_of_tests_pass+num_of_tests_failed) ,num_of_tests_pass,num_of_tests_failed); yaffs_unmount(YAFFS_MOUNT_POINT); @@ -112,27 +151,32 @@ void get_error(void) void init_quick_tests(int argc, char *argv[]) { int trace=0; + int new_option; int x=0; - for (x = 0; x < argc; x++){ - if (0==strcmp(argv[x],"-h")){ + do{ + new_option=getopt_long(argc,argv,short_options,long_options,NULL); + if (new_option=='h'){ printf("help\n"); printf("-h will print the commands available\n"); - printf("-c will continue after a test failes else the program will exit\n"); + printf("-c will continue after a test fails else the program will exit\n"); printf("-v will print all messages\n"); printf("-q quiet mode only the number of tests passed and failed will be printed\n"); printf("-t [number] set yaffs_trace to number\n"); + printf("-n [number] sets the number of random loops to run after the the test has run\n"); exit(0); - } else if (0==strcmp(argv[x],"-c")) { + } else if (new_option=='c') { set_exit_on_error(0); - } else if (0==strcmp(argv[x],"-q")) { + } else if (new_option=='q') { set_print_level(-3); - } else if (0==strcmp(argv[x],"-t")) { - trace = atoi(argv[x+1]); - } else if (0==strcmp(argv[x],"-v")) { + } else if (new_option=='t') { + trace = atoi(optarg); + } else if (new_option=='v') { set_print_level(5); + } else if (new_option=='n') { + number_of_random_tests=atoi(optarg); } - } + }while (new_option!=-1); yaffs_start_up(); yaffs_set_trace(trace);