X-Git-Url: https://yaffs.net/gitweb/?a=blobdiff_plain;f=direct%2Ftimothy_tests%2Fquick_tests%2Fquick_tests.c;h=3753583823f22542c58a0a5e7adcd02abbca9307;hb=25633e8452addb4efafd1dedde957e1b14a07fd9;hp=1c23eb2f6b48c323f9988970866db96a486f9498;hpb=26592c53da98ac887099559afbcb8dda05264e1c;p=yaffs2.git

diff --git a/direct/timothy_tests/quick_tests/quick_tests.c b/direct/timothy_tests/quick_tests/quick_tests.c
index 1c23eb2..3753583 100644
--- a/direct/timothy_tests/quick_tests/quick_tests.c
+++ b/direct/timothy_tests/quick_tests/quick_tests.c
@@ -1,52 +1,29 @@
+/*
+ * YAFFS: Yet another FFS. A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2010 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Timothy Manning <timothy@yaffs.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
 #include "quick_tests.h"
 
-#include "yaffsfs.h"
+
 int random_seed;
 int simulate_power_failure = 0;
 
 
 
-typedef struct test {
-	int (*p_function)(void);	/*pointer to test function*/
-	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;
-
-
-int dummy_test_pass(void){
-	//printf("running dummy_test_pass\n");
-	return 1;
-}
-void dummy_test_pass_clean(void){
-	
-}
-int dummy_test_fail(void){
-	//printf("running dummy_test_fail\n");
-	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"},
-
-	{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));
+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 output=0;
@@ -60,6 +37,7 @@ int main(){
 	//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*/
@@ -90,10 +68,17 @@ 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);
 }