diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-01-14 05:06:50 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:40:45 -0500 |
| commit | 70dcbd1f0f4fa0c8cd5b473ac57ac7aad11e9343 (patch) | |
| tree | 41a0f08e5391aa94bd1de58f92d38cbd2cc5d69f /source4/torture | |
| parent | 10e1a80b9ec04f885fa983292a5be8fbe69a1a52 (diff) | |
| download | samba-70dcbd1f0f4fa0c8cd5b473ac57ac7aad11e9343.tar.gz samba-70dcbd1f0f4fa0c8cd5b473ac57ac7aad11e9343.tar.bz2 samba-70dcbd1f0f4fa0c8cd5b473ac57ac7aad11e9343.zip | |
r20757: Strip recipe functionality (should be one layer up)
(This used to be commit a3f7b184735fb6467bec03eeff53a72003a78097)
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/smbtorture.c | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c index b06fb19f3d..018c7260af 100644 --- a/source4/torture/smbtorture.c +++ b/source4/torture/smbtorture.c @@ -423,33 +423,6 @@ const static struct torture_ui_ops quiet_ui_ops = { .test_result = quiet_test_result }; -void run_recipe(struct torture_context *tctx, const char *recipe) -{ - int numlines, i, ret; - char **lines; - - lines = file_lines_load(recipe, &numlines, NULL); - if (lines == NULL) { - fprintf(stderr, "Unable to load file %s\n", recipe); - return; - } - - for (i = 0; i < numlines; i++) { - int argc; - const char **argv; - - ret = poptParseArgvString(lines[i], &argc, &argv); - if (ret != 0) { - fprintf(stderr, "Error parsing line\n"); - continue; - } - - run_test(tctx, argv[0]); - } - - talloc_free(lines); -} - void run_shell(struct torture_context *tctx) { char *cline; @@ -686,9 +659,7 @@ int main(int argc,char *argv[]) double rate; int unexpected_failures; for (i=2;i<argc_new;i++) { - if (argv_new[i][0] == '@') { - run_recipe(torture, argv_new[i]+1); - } else if (!run_test(torture, argv_new[i])) { + if (!run_test(torture, argv_new[i])) { correct = false; } } |