Changeset 745 for trunk/server/source3/lib/smbconf/testsuite.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/lib/smbconf/testsuite.c (modified) (13 diffs)

trunk/server/source3/lib/smbconf/testsuite.c

@@ -19 +19 @@
 
 #include "includes.h"
+#include "popt_common.h"
+#include "lib/smbconf/smbconf.h"
+#include "lib/smbconf/smbconf_init.h"
+#include "lib/smbconf/smbconf_reg.h"
+#include "lib/smbconf/smbconf_txt.h"
 
 static void print_strings(const char *prefix,
@@ -36 +41 @@
 static bool test_get_includes(struct smbconf_ctx *ctx)
 {
-        WERROR werr;
+        sbcErr err;
         bool ret = false;
         uint32_t num_includes = 0;
@@ -43 +48 @@
 
         printf("TEST: get_includes\n");
-        werr = smbconf_get_global_includes(ctx, mem_ctx,
-                                           &num_includes, &includes);
-        if (!W_ERROR_IS_OK(werr)) {
-                printf("FAIL: get_includes - %s\n", win_errstr(werr));
+        err = smbconf_get_global_includes(ctx, mem_ctx,
+                                          &num_includes, &includes);
+        if (!SBC_ERROR_IS_OK(err)) {
+                printf("FAIL: get_includes - %s\n", sbcErrorString(err));
                 goto done;
         }
@@ -64 +69 @@
 static bool test_set_get_includes(struct smbconf_ctx *ctx)
 {
-        WERROR werr;
+        sbcErr err;
         uint32_t count;
         bool ret = false;
@@ -78 +83 @@
         printf("TEST: set_get_includes\n");
 
-        werr = smbconf_set_global_includes(ctx, set_num_includes, set_includes);
-        if (!W_ERROR_IS_OK(werr)) {
+        err = smbconf_set_global_includes(ctx, set_num_includes, set_includes);
+        if (!SBC_ERROR_IS_OK(err)) {
                 printf("FAIL: get_set_includes (setting includes) - %s\n",
-                       win_errstr(werr));
-                goto done;
-        }
-
-        werr = smbconf_get_global_includes(ctx, mem_ctx, &get_num_includes,
-                                           &get_includes);
-        if (!W_ERROR_IS_OK(werr)) {
+                       sbcErrorString(err));
+                goto done;
+        }
+
+        err = smbconf_get_global_includes(ctx, mem_ctx, &get_num_includes,
+                                          &get_includes);
+        if (!SBC_ERROR_IS_OK(err)) {
                 printf("FAIL: get_set_includes (getting includes) - %s\n",
-                       win_errstr(werr));
+                       sbcErrorString(err));
                 goto done;
         }
@@ -121 +126 @@
 static bool test_delete_includes(struct smbconf_ctx *ctx)
 {
-        WERROR werr;
+        sbcErr err;
         bool ret = false;
         const char *set_includes[] = {
@@ -133 +138 @@
         printf("TEST: delete_includes\n");
 
-        werr = smbconf_set_global_includes(ctx, set_num_includes, set_includes);
-        if (!W_ERROR_IS_OK(werr)) {
+        err = smbconf_set_global_includes(ctx, set_num_includes, set_includes);
+        if (!SBC_ERROR_IS_OK(err)) {
                 printf("FAIL: delete_includes (setting includes) - %s\n",
-                       win_errstr(werr));
-                goto done;
-        }
-
-        werr = smbconf_delete_global_includes(ctx);
-        if (!W_ERROR_IS_OK(werr)) {
+                       sbcErrorString(err));
+                goto done;
+        }
+
+        err = smbconf_delete_global_includes(ctx);
+        if (!SBC_ERROR_IS_OK(err)) {
                 printf("FAIL: delete_includes (deleting includes) - %s\n",
-                       win_errstr(werr));
-                goto done;
-        }
-
-        werr = smbconf_get_global_includes(ctx, mem_ctx, &get_num_includes,
-                                           &get_includes);
-        if (!W_ERROR_IS_OK(werr)) {
+                       sbcErrorString(err));
+                goto done;
+        }
+
+        err = smbconf_get_global_includes(ctx, mem_ctx, &get_num_includes,
+                                          &get_includes);
+        if (!SBC_ERROR_IS_OK(err)) {
                 printf("FAIL: delete_includes (getting includes) - %s\n",
-                       win_errstr(werr));
+                       sbcErrorString(err));
                 goto done;
         }
@@ -160 +165 @@
         }
 
-        werr = smbconf_delete_global_includes(ctx);
-        if (!W_ERROR_IS_OK(werr)) {
+        err = smbconf_delete_global_includes(ctx);
+        if (!SBC_ERROR_IS_OK(err)) {
                 printf("FAIL: delete_includes (delete empty includes) - "
-                       "%s\n", win_errstr(werr));
+                       "%s\n", sbcErrorString(err));
                 goto done;
         }
@@ -199 +204 @@
 static bool torture_smbconf_txt(void)
 {
-        WERROR werr;
+        sbcErr err;
         bool ret = true;
         const char *filename = "/tmp/smb.conf.smbconf_testsuite";
@@ -213 +218 @@
 
         printf("TEST: init\n");
-        werr = smbconf_init_txt(mem_ctx, &conf_ctx, filename);
-        if (!W_ERROR_IS_OK(werr)) {
-                printf("FAIL: text backend failed: %s\n", win_errstr(werr));
+        err = smbconf_init_txt(mem_ctx, &conf_ctx, filename);
+        if (!SBC_ERROR_IS_OK(err)) {
+                printf("FAIL: text backend failed: %s\n", sbcErrorString(err));
                 ret = false;
                 goto done;
@@ -241 +246 @@
 static bool torture_smbconf_reg(void)
 {
-        WERROR werr;
+        sbcErr err;
         bool ret = true;
         struct smbconf_ctx *conf_ctx = NULL;
@@ -249 +254 @@
 
         printf("TEST: init\n");
-        werr = smbconf_init_reg(mem_ctx, &conf_ctx, NULL);
-        if (!W_ERROR_IS_OK(werr)) {
-                printf("FAIL: init failed: %s\n", win_errstr(werr));
+        err = smbconf_init_reg(mem_ctx, &conf_ctx, NULL);
+        if (!SBC_ERROR_IS_OK(err)) {
+                printf("FAIL: init failed: %s\n", sbcErrorString(err));
                 ret = false;
                 goto done;
@@ -290 +295 @@
 
         load_case_tables();
-        dbf = x_stderr;
+        setup_logging(argv[0], DEBUG_STDERR);
 
         /* parse options */