X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Ftimothy_tests%2Fquick_tests%2Ftest_yaffs_mount_ENAMETOOLONG.c;h=e0d6b3233bffc51063ea398d64969096f707e8e4;hp=a61d0b3212c7a043d21e35d724749fdd47b7d8a9;hb=6648cbf52d6695755941ff8607fd7a0cda542e05;hpb=559fc3d004f76e506ecb5e7efe56fdb5cceed943

diff --git a/direct/timothy_tests/quick_tests/test_yaffs_mount_ENAMETOOLONG.c b/direct/timothy_tests/quick_tests/test_yaffs_mount_ENAMETOOLONG.c
index a61d0b3..e0d6b32 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_mount_ENAMETOOLONG.c
+++ b/direct/timothy_tests/quick_tests/test_yaffs_mount_ENAMETOOLONG.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 <timothy@yaffs.net>
@@ -16,42 +16,48 @@
 
 
 
-int test_yaffs_mount_ENAMETOOLONG(void){
-	int output=0;
-	int x;
-	int error_code=0;
-	int file_name_length=1000000;
+int test_yaffs_mount_ENAMETOOLONG(void)
+{
+	int output = 0;
+	int x = 0;
+	int error_code = 0;
+	int file_name_length = 1000000;
 	char file_name[file_name_length];
 
-	strcat(file_name,YAFFS_MOUNT_POINT);
-	for (x=strlen(YAFFS_MOUNT_POINT); x<file_name_length -1; x++){
+	/* if a second file system is mounted then yaffs will return EBUSY. so first unmount yaffs */
+	output = test_yaffs_unmount();
+	if (output<0){
+		print_message("yaffs failed to unmount\n", 2);
+		return -1;
+	} 
+
+	/* set up the file name */
+	for (x=0; x<file_name_length -1; x++){
 		file_name[x]='a';
 	}
 	file_name[file_name_length-2]='\0';
 	
-	//printf("file name: %s\n",file_name);
+
 
 
 	output=yaffs_mount(file_name);
 
-	if (output==-1){
+	if (output<0){
 		error_code=yaffs_get_error();
 		if (abs(error_code)== ENAMETOOLONG){
 			return 1;
-		}
-		else {
-			printf("different error than expected\n");
+		} else {
+			print_message("different error than expected\n", 2);
 			return -1;
 		}
-	}
-	else {
-		printf("non existant file opened.(which is a bad thing)\n");
+	} else {
+		print_message("mounted a too long mount point name.(which is a bad thing)\n", 2);
 		return -1;
 	}
-	/* the program should not get here but the compiler is complaining */
-	return -1;
 }
-int test_yaffs_mount_ENAMETOOLONG_clean(void){
-	return -1;
+
+int test_yaffs_mount_ENAMETOOLONG_clean(void)
+{
+	return test_yaffs_mount();
 }