r16907: Add an index parameter to torture_open_connection. Next step is to enable the

[gd/samba-autobuild/.git] / source4 / torture / basic / dir.c

diff --git a/source4/torture/basic/dir.c b/source4/torture/basic/dir.c
index 7921b3eb0334aa952d8396d181baf5b0739214c0..01d25e5d4a51c372d11ed3698e51df1fe8d78ea2 100644 (file)
--- a/source4/torture/basic/dir.c
+++ b/source4/torture/basic/dir.c
@@ -21,8 +21,12 @@
 */
 
 #include "includes.h"
+#include "libcli/libcli.h"
+#include "torture/torture.h"
+#include "torture/util.h"
+#include "system/filesys.h"
 
-static void list_fn(struct file_info *finfo, const char *name, void *state)
+static void list_fn(struct clilist_file_info *finfo, const char *name, void *state)
 {
        
 }
@@ -30,7 +34,7 @@ static void list_fn(struct file_info *finfo, const char *name, void *state)
 /*
   test directory listing speed
  */
-BOOL torture_dirtest1(void)
+BOOL torture_dirtest1(struct torture_context *torture)
 {
        int i;
        struct smbcli_state *cli;
@@ -41,7 +45,7 @@ BOOL torture_dirtest1(void)
 
        printf("starting dirtest1\n");
 
-       if (!torture_open_connection(&cli)) {
+       if (!torture_open_connection(&cli, 0)) {
                return False;
        }
 
@@ -85,7 +89,7 @@ BOOL torture_dirtest1(void)
        return correct;
 }
 
-BOOL torture_dirtest2(void)
+BOOL torture_dirtest2(struct torture_context *torture)
 {
        int i;
        struct smbcli_state *cli;
@@ -95,16 +99,11 @@ BOOL torture_dirtest2(void)
 
        printf("starting dirtest2\n");
 
-       if (!torture_open_connection(&cli)) {
+       if (!torture_open_connection(&cli, 0)) {
                return False;
        }
 
-       if (smbcli_deltree(cli->tree, "\\LISTDIR") == -1) {
-               fprintf(stderr,"Failed to deltree %s, error=%s\n", "\\LISTDIR", smbcli_errstr(cli->tree));
-               return False;
-       }
-       if (NT_STATUS_IS_ERR(smbcli_mkdir(cli->tree, "\\LISTDIR"))) {
-               fprintf(stderr,"Failed to mkdir %s, error=%s\n", "\\LISTDIR", smbcli_errstr(cli->tree));
+       if (!torture_setup_dir(cli, "\\LISTDIR")) {
                return False;
        }
 
@@ -114,8 +113,11 @@ BOOL torture_dirtest2(void)
        for (i=0;i<torture_entries;i++) {
                char *fname;
                asprintf(&fname, "\\LISTDIR\\f%d", i);
-               fnum = smbcli_nt_create_full(cli->tree, fname, 0, GENERIC_RIGHTS_FILE_ALL_ACCESS, FILE_ATTRIBUTE_ARCHIVE,
-                                  NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
+               fnum = smbcli_nt_create_full(cli->tree, fname, 0, 
+                                            SEC_RIGHTS_FILE_ALL,
+                                            FILE_ATTRIBUTE_ARCHIVE,
+                                            NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE, 
+                                            NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
                if (fnum == -1) {
                        fprintf(stderr,"(%s) Failed to open %s, error=%s\n", 
                                __location__, fname, smbcli_errstr(cli->tree));