From 70dcbd1f0f4fa0c8cd5b473ac57ac7aad11e9343 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 14 Jan 2007 05:06:50 +0000
Subject: r20757: Strip recipe functionality (should be one layer up) (This
 used to be commit a3f7b184735fb6467bec03eeff53a72003a78097)

---
 source4/torture/smbtorture.c | 31 +------------------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

(limited to 'source4/torture')

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;
 			}
 		}
-- 
cgit