Author: jelmer Date: 2007-01-14 05:06:50 +0000 (Sun, 14 Jan 2007) New Revision: 20757
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20757 Log: Strip recipe functionality (should be one layer up) Modified: branches/SAMBA_4_0/source/torture/smbtorture.c Changeset: Modified: branches/SAMBA_4_0/source/torture/smbtorture.c =================================================================== --- branches/SAMBA_4_0/source/torture/smbtorture.c 2007-01-14 04:32:11 UTC (rev 20756) +++ branches/SAMBA_4_0/source/torture/smbtorture.c 2007-01-14 05:06:50 UTC (rev 20757) @@ -423,33 +423,6 @@ .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 @@ 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; } }
