X-Git-Url: https://yaffs.net/gitweb/?a=blobdiff_plain;f=direct%2Ftest-framework%2Ftimothy_tests%2Fquick_tests%2Ftest_yaffs_rmdir_ENOTEMPTY.c;h=350f2366e8ab2319f27dd4ec130b4b063c05a749;hb=1f3d64d1d804fef6715126dead54bf30b176c67e;hp=6b8c046a0d7fee12bee6d68f8d050520ca080a2a;hpb=e5daa72b0083831ab762a650860687fe7d25d6b3;p=yaffs2.git

diff --git a/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_ENOTEMPTY.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_ENOTEMPTY.c
index 6b8c046..350f236 100644
--- a/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_ENOTEMPTY.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_ENOTEMPTY.c
@@ -1,8 +1,7 @@
 /*
  * YAFFS: Yet another FFS. A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2011 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
+ * Copyright (C) 2002-2018 Aleph One Ltd.
  *
  * Created by Timothy Manning <timothy@yaffs.net>
  *
@@ -18,7 +17,10 @@ int test_yaffs_rmdir_ENOTEMPTY(void)
 {
 	int output=0;
 	int error_code =0;
-
+	if (yaffs_close(yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE))==-1){
+		print_message("failed to create file\n",1);
+		return -1;
+	}
 	if (0 !=  yaffs_access(DIR_PATH,0)) {
 		output = yaffs_mkdir(DIR_PATH,S_IWRITE | S_IREAD);
 		if (output < 0) {
@@ -26,8 +28,8 @@ int test_yaffs_rmdir_ENOTEMPTY(void)
 			return -1;
 		}
 	}
-	if (0 !=  yaffs_access("/yaffs2/new_directory/dir",0)) {
-		output = yaffs_mkdir("/yaffs2/new_directory/dir",S_IWRITE | S_IREAD);
+	if (0 !=  yaffs_access(YAFFS_MOUNT_POINT "/test_dir/new_directory/dir",0)) {
+		output = yaffs_mkdir(YAFFS_MOUNT_POINT "/test_dir/new_directory/dir",S_IWRITE | S_IREAD);
 		if (output < 0) {
 			print_message("failed to create directory\n",2);
 			return -1;
@@ -53,8 +55,8 @@ int test_yaffs_rmdir_ENOTEMPTY_clean(void)
 {
 	int output = -1;
 	int output2 = -1;
-	if (0 ==  yaffs_access("/yaffs2/new_directory/dir",0)) {
-		output = yaffs_rmdir("/yaffs2/new_directory/dir");
+	if (0 ==  yaffs_access(YAFFS_MOUNT_POINT "/test_dir/new_directory/dir",0)) {
+		output = yaffs_rmdir(YAFFS_MOUNT_POINT "/test_dir/new_directory/dir");
 		if (output < 0) {
 			print_message("failed to remove the directory\n",2);
 			output=1;