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=17bce3b7321eddd6e4f52904ad2fb2c1fd313523;hp=bdef486e65c010b2a0cd582976c5574fd6e5cd0a;hb=a32621e0d7f5f391e9152cfe710fa6c99ca44c50;hpb=a11dd4924d16a4c3d6df13a4182f7729a1478a53

diff --git a/direct/timothy_tests/quick_tests/quick_tests.c b/direct/timothy_tests/quick_tests/quick_tests.c
index bdef486..17bce3b 100644
--- a/direct/timothy_tests/quick_tests/quick_tests.c
+++ b/direct/timothy_tests/quick_tests/quick_tests.c
@@ -27,62 +27,91 @@ 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");
+	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 */
+		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*/
+			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].fail_message);		
+			sprintf(message,"test: %s failed\n",test_list[x].name_of_test);
+			print_message(message,1);		
 			num_of_tests_failed ++;	
-			quit_quick_tests(1);
-			
+		
+			get_error();
+			print_message("\n\n",1);
+			if (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 */
-			printf("test: %s failed to clean\n",test_list[x].fail_message);		
+			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--;
-			quit_quick_tests(1);
-		}
+			get_error();
+			printf("\n\n");
+			if (EXIT_ON_ERROR){
+				quit_quick_tests(1);
+			}
 			
+		} else {
+			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){
-	int error_code=0;
+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");
 	}
-	else {
-		error_code=yaffs_get_error();
-		printf("yaffs_error code %d\n",error_code);
-		printf("error is : %s\n",yaffs_error_to_str(error_code));
-	}
-	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 init_quick_tests(void){
-	yaffs_start_up();;
+void get_error(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(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();
 	yaffs_set_trace(0);
 
 }