X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Ftimothy_tests%2Fquick_tests%2Ftest_yaffs_mkdir.c;h=543775bd48110f653328c26dc8deec5aaf9f80c3;hp=aedaa8024b5dd4f2bec1db0fee472b5c86b91b09;hb=00ebf30805d631cd9bb3155aa249705b3a5777f5;hpb=6ec15829a2deee7512bce78387547393585c5dd2 diff --git a/direct/timothy_tests/quick_tests/test_yaffs_mkdir.c b/direct/timothy_tests/quick_tests/test_yaffs_mkdir.c index aedaa80..543775b 100644 --- a/direct/timothy_tests/quick_tests/test_yaffs_mkdir.c +++ b/direct/timothy_tests/quick_tests/test_yaffs_mkdir.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 @@ -13,21 +13,29 @@ #include "test_yaffs_mkdir.h" -static int handle = 0; + int test_yaffs_mkdir(void) { - handle = yaffs_mkdir("/yaffs2/new_directory/",O_CREAT | O_RDWR); - return handle; + int output=-1; + if (0==yaffs_access(DIR_PATH,0)) { + output=yaffs_rmdir(DIR_PATH); + if (output<0) { + print_message("the directory already exists and cannot be removed.\n",2); + return -1; + } + } + output = yaffs_mkdir(DIR_PATH,O_CREAT | O_RDWR); + return output; } int test_yaffs_mkdir_clean(void) { - if (handle >= 0){ - return yaffs_rmdir("/yaffs2/new_directory/"); + if (0==yaffs_access(DIR_PATH,0)) { + return yaffs_rmdir(DIR_PATH); } else { - return 1; /* the file failed to open so there is no need to close it */ + return 1; } }