r4445: put the unlink test in a subdirectory, and ensure it cleans up

(This used to be commit 382231ca365eccec8024af9420b1ebe41953bdb5)

diff --git a/source4/torture/basic/unlink.c b/source4/torture/basic/unlink.c
index 75d1549fcf13cc4d3a866c96fb2bbaf2a37ce3f3..30d862e3453fd856816caea049f5dc41c2e9d837 100644 (file)
--- a/source4/torture/basic/unlink.c
+++ b/source4/torture/basic/unlink.c
@@ -24,6 +24,8 @@
 #include "libcli/raw/libcliraw.h"
 #include "librpc/gen_ndr/ndr_security.h"
 
+#define BASEDIR "\\unlinktest"
+
 /*
   This test checks that 
 
@@ -32,7 +34,7 @@
 BOOL torture_unlinktest(void)
 {
        struct smbcli_state *cli;
-       const char *fname = "\\unlink.tst";
+       const char *fname = BASEDIR "\\unlink.tst";
        int fnum;
        BOOL correct = True;
        union smb_open io;
@@ -44,7 +46,9 @@ BOOL torture_unlinktest(void)
 
        printf("starting unlink test\n");
 
-       smbcli_unlink(cli->tree, fname);
+       if (!torture_setup_dir(cli, BASEDIR)) {
+               return False;
+       }
 
        cli->session->pid = 1;