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=1f6a935cfc90af888d7bcd607760d9d833aae8d7;hp=bdef486e65c010b2a0cd582976c5574fd6e5cd0a;hb=8f3b332855f68abc47f9da5b0f1877f33f70ba15;hpb=a11dd4924d16a4c3d6df13a4182f7729a1478a53

diff --git a/direct/timothy_tests/quick_tests/quick_tests.c b/direct/timothy_tests/quick_tests/quick_tests.c
index bdef486..1f6a935 100644
--- a/direct/timothy_tests/quick_tests/quick_tests.c
+++ b/direct/timothy_tests/quick_tests/quick_tests.c
@@ -31,12 +31,13 @@ int main(){
 
 	unsigned int x=0;	
 	init_quick_tests();
-	printf("\n\nrunning quick tests for yaffs\n");
+	printf("\n\nrunning quick tests for yaffs\n\n");
 	//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 */
 		output=test_list[x].p_function();	/*run test*/
 		if (output>=0){
 			/*test has passed*/
@@ -45,18 +46,31 @@ int main(){
 		else {
 			/*test is assumed to have failed*/
 			//printf("test failed\n");
-			printf("test: %s failed\n",test_list[x].fail_message);		
+			printf("test: %s failed\n",test_list[x].name_of_test);		
 			num_of_tests_failed ++;	
-			quit_quick_tests(1);
-			
+
+			if (EXIT_ON_ERROR){
+				get_error();
+				printf("\n\n");
+				quit_quick_tests(1);
+			}
+			else {
+				get_error();
+				printf("\n\n");
+			}
 		}
 		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);		
+			printf("test: %s failed to clean\n",test_list[x].name_of_test);		
 			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);
+			}
+			
 		}
 			
 	}
@@ -67,20 +81,22 @@ int main(){
 }
 
 void quit_quick_tests(int exit_code){
-	int error_code=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);
 	yaffs_unmount(YAFFS_MOUNT_POINT);
 	exit(exit_code);
 }
 
+void get_error(void){
+	int error_code=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));
+}
+
 void init_quick_tests(void){
 	yaffs_start_up();;
 	yaffs_set_trace(0);