X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Ftimothy_tests%2Fquick_tests%2Ftest_yaffs_rename_dir_not_empty.c;h=9b37209fd835119c098a2faa92e130b1ed6d84e9;hp=637f758de4db9be49e00056db93036ba069c7f8a;hb=a78bce6f4a7042fa153ab32d2bb263ecf7d27b66;hpb=43f79e97ed02fe66be94b568da60126bcc351b0c

diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rename_dir_not_empty.c b/direct/timothy_tests/quick_tests/test_yaffs_rename_dir_not_empty.c
index 637f758..9b37209 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_rename_dir_not_empty.c
+++ b/direct/timothy_tests/quick_tests/test_yaffs_rename_dir_not_empty.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>
@@ -36,6 +36,14 @@ int test_yaffs_rename_dir(void)
 int test_yaffs_rename_dir_clean(void)
 {
 	int output = 0;
+	if (0 ==  yaffs_access("/yaffs2/new_directory/file",0)) {
+		output = yaffs_unlink("/yaffs2/new_directory/file");
+		if (output < 0) {
+			print_message("failed to remove file\n",2);
+			return -1;
+		}
+	}
+
 	if (0 ==  yaffs_access(RENAME_DIR_PATH,0)) {
 		output = yaffs_rename(RENAME_DIR_PATH,DIR_PATH);
 		if (output < 0) {