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=1c23eb2f6b48c323f9988970866db96a486f9498;hp=125624d022a721979ceb2006550598914a731641;hb=26592c53da98ac887099559afbcb8dda05264e1c;hpb=10fffbf6cc8a96cb9b3b9164c668202010e37faa

diff --git a/direct/timothy_tests/quick_tests/quick_tests.c b/direct/timothy_tests/quick_tests/quick_tests.c
index 125624d..1c23eb2 100644
--- a/direct/timothy_tests/quick_tests/quick_tests.c
+++ b/direct/timothy_tests/quick_tests/quick_tests.c
@@ -8,7 +8,7 @@ int simulate_power_failure = 0;
 
 typedef struct test {
 	int (*p_function)(void);	/*pointer to test function*/
-	void (*p_function_clean)(void);
+	int (*p_function_clean)(void);
 	/*char pass_message[50]; will not need a pass message*/
 	char *fail_message;	/*pointer to fail message, needs to include name of test*/
 }test_template;
@@ -23,32 +23,45 @@ void dummy_test_pass_clean(void){
 }
 int dummy_test_fail(void){
 	//printf("running dummy_test_fail\n");
-	return 0;
+	return -1;
 }
 void dummy_test_fail_clean(void){
 }
 test_template test_list[]={
-	{dummy_test_pass,dummy_test_pass_clean,"dummy_test_pass"},
-	{dummy_test_fail,dummy_test_fail_clean,"dummy_test_fail"},
-	{mount_yaffs_test,mount_yaffs_test_clean,"mount_yaffs_test"}
+	//{dummy_test_pass,dummy_test_pass_clean,"dummy_test_pass"},
+	//{dummy_test_fail,dummy_test_fail_clean,"dummy_test_fail"},
+	{mount_yaffs_test,mount_yaffs_test_clean,"mount_yaffs_test"},
+
+	{test_open_file,test_open_file_clean,"test_open_file"},
+	{test_yaffs_unlinking, test_yaffs_unlinking_clean,"test_yaffs_unlinking"},
+
+	{test_yaffs_lseek,test_yaffs_lseek_clean,"test_yaffs_lseek"},
+	{test_yaffs_read,test_yaffs_read_clean,"test_yaffs_read"},
+	{test_yaffs_write,test_yaffs_write_clean,"test_yaffs_write"},
+
+	{test_yaffs_ftruncate,test_yaffs_ftruncate_clean,"test_yaffs_ftruncate"},
+	{test_yaffs_truncate,test_yaffs_truncate_clean,"test_yaffs_truncate"}
+
 	};
 
+unsigned int num_of_tests_pass=0;
+unsigned int num_of_tests_failed=0;
+unsigned int total_number_of_tests=(sizeof(test_list)/sizeof(test_template));
 
 int main(){
 	int output=0;
-	unsigned int num_of_tests_pass=0;
-	int num_of_tests_failed=0;
-	unsigned int total_number_of_tests=(sizeof(test_list)/sizeof(test_template));
+
+
 	unsigned int x=0;	
 	init_quick_tests();
-	printf("quick tests for yaffs\n");
+	printf("\n\nrunning quick tests for yaffs\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);
 		output=test_list[x].p_function();	/*run test*/
-		if (output>0){
+		if (output>=0){
 			/*test has passed*/
 			num_of_tests_pass++;
 		}
@@ -57,19 +70,35 @@ int main(){
 			//printf("test failed\n");
 			printf("test: %s failed\n",test_list[x].fail_message);		
 			num_of_tests_failed ++;	
+			quit_quick_tests(1);
+			
+		}
+		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);		
+			num_of_tests_failed ++;	
+			num_of_tests_pass--;
+			quit_quick_tests(1);
 		}
-		test_list[x].p_function_clean();	/*run test*/
 			
 	}
-	if (num_of_tests_pass==total_number_of_tests){
+	/*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){
+	if (num_of_tests_pass==total_number_of_tests &&  num_of_tests_failed==0){
 		printf("\t OK \n");
 	}
-	printf("tests: %d passed %d failed\n",num_of_tests_pass,num_of_tests_failed);
-	return 0;
+	printf("tests: %d passed %d failed\n\n\n",num_of_tests_pass,num_of_tests_failed);
+	exit(exit_code);
 }
 
 void init_quick_tests(void){
 	yaffs_start_up();;
-	//yaffs_set_trace(0);
+	yaffs_set_trace(0);
 
 }