diff options
Diffstat (limited to 'source4/lib/torture')
-rw-r--r-- | source4/lib/torture/torture.c | 15 | ||||
-rw-r--r-- | source4/lib/torture/torture.h | 4 |
2 files changed, 3 insertions, 16 deletions
diff --git a/source4/lib/torture/torture.c b/source4/lib/torture/torture.c index 33959ded16..ba7168f3fe 100644 --- a/source4/lib/torture/torture.c +++ b/source4/lib/torture/torture.c @@ -20,7 +20,7 @@ #include "includes.h" #include "torture/torture.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "param/param.h" #include "system/filesys.h" @@ -235,19 +235,6 @@ void torture_ui_test_start(struct torture_context *context, context->ui_ops->test_start(context, tcase, test); } -int str_list_match(const char *name, char **list) -{ - int i, ret = 0; - if (list == NULL) - return 0; - - for (i = 0; list[i]; i++) { - if (gen_fnmatch(list[i], name) == 0) - ret++; - } - return ret; -} - void torture_ui_test_result(struct torture_context *context, enum torture_result result, const char *comment) diff --git a/source4/lib/torture/torture.h b/source4/lib/torture/torture.h index f023f319ff..0f966a52d1 100644 --- a/source4/lib/torture/torture.h +++ b/source4/lib/torture/torture.h @@ -267,7 +267,7 @@ void torture_result(struct torture_context *test, char *__got; \ const char *__expected = (expected); \ size_t __size; \ - __got = file_load(filename, &__size, torture_ctx); \ + __got = file_load(filename, &__size, 0, torture_ctx); \ if (__got == NULL) { \ torture_result(torture_ctx, TORTURE_FAIL, \ __location__": unable to open %s: %s\n", \ @@ -288,7 +288,7 @@ void torture_result(struct torture_context *test, #define torture_assert_file_contains(torture_ctx,filename,expected,cmt)\ do { const char *__got, *__expected = (expected); \ size_t __size; \ - __got = file_load(filename, *size, torture_ctx); \ + __got = file_load(filename, *size, 0, torture_ctx); \ if (strcmp_safe(__got, __expected) != 0) { \ torture_result(torture_ctx, TORTURE_FAIL, \ __location__": %s contained:\n%sExpected: %s%s\n", \ |