svn commit: samba r19680 - in branches/SAMBA_4_0/source: script/tests torture

[jelmer at samba.org]

Author: jelmer
Date: 2006-11-12 03:40:38 +0000 (Sun, 12 Nov 2006)
New Revision: 19680

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19680

Log:
Allow specifying basedir for test data. 
Create temporary directories in base directory.

Modified:
   branches/SAMBA_4_0/source/script/tests/mktestsetup.sh
   branches/SAMBA_4_0/source/torture/smbtorture.c
   branches/SAMBA_4_0/source/torture/util.c


Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/mktestsetup.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/mktestsetup.sh	2006-11-12 03:36:47 UTC (rev 19679)
+++ branches/SAMBA_4_0/source/script/tests/mktestsetup.sh	2006-11-12 03:40:38 UTC (rev 19680)
@@ -110,6 +110,7 @@
 	notify:inotify = false
 	ldb:nosync = true
 	torture:subunitdir = $SRCDIR/bin/torture
+	torture:basedir = $TEST_DATA_PREFIX
 
 	system:anonymous = true
 #We don't want to pass our self-tests if the PAC code is wrong

Modified: branches/SAMBA_4_0/source/torture/smbtorture.c
===================================================================
--- branches/SAMBA_4_0/source/torture/smbtorture.c	2006-11-12 03:36:47 UTC (rev 19679)
+++ branches/SAMBA_4_0/source/torture/smbtorture.c	2006-11-12 03:40:38 UTC (rev 19680)
@@ -519,12 +519,13 @@
 	int shell = False;
 	static const char *ui_ops_name = "simple";
 	enum {OPT_LOADFILE=1000,OPT_UNCLIST,OPT_TIMELIMIT,OPT_DNS,
-	      OPT_DANGEROUS,OPT_SMB_PORTS,OPT_ASYNC,OPT_NUMPROGS};
+	      OPT_DANGEROUS,OPT_SMB_PORTS,OPT_ASYNC,OPT_NUMPROGS, OPT_BASEDIR};
 	
 	struct poptOption long_options[] = {
 		POPT_AUTOHELP
 		{"format", 0, POPT_ARG_STRING, &ui_ops_name, 0, "Output format (one of: simple, subunit, harness)", NULL },
 		{"smb-ports",	'p', POPT_ARG_STRING, NULL,     OPT_SMB_PORTS,	"SMB ports", 	NULL},
+		{"basedir",	  0, POPT_ARG_STRING, NULL, OPT_BASEDIR, "base directory", "BSAEDIR" },
 		{"seed",	  0, POPT_ARG_INT,  &torture_seed, 	0,	"seed", 	NULL},
 		{"num-progs",	  0, POPT_ARG_INT,  NULL, 	OPT_NUMPROGS,	"num progs",	NULL},
 		{"num-ops",	  0, POPT_ARG_INT,  &torture_numops, 	0, 	"num ops",	NULL},
@@ -575,6 +576,9 @@
 		case OPT_NUMPROGS:
 			lp_set_cmdline("torture:nprocs", poptGetOptArg(pc));
 			break;
+		case OPT_BASEDIR:
+			lp_set_cmdline("torture:basedir", poptGetOptArg(pc));
+			break;
 		case OPT_DNS:
 			parse_dns(poptGetOptArg(pc));
 			break;

Modified: branches/SAMBA_4_0/source/torture/util.c
===================================================================
--- branches/SAMBA_4_0/source/torture/util.c	2006-11-12 03:36:47 UTC (rev 19679)
+++ branches/SAMBA_4_0/source/torture/util.c	2006-11-12 03:40:38 UTC (rev 19680)
@@ -31,7 +31,10 @@
 _PUBLIC_ NTSTATUS torture_temp_dir(TALLOC_CTX *mem_ctx, const char *prefix, 
 								   char **tempdir)
 {
-	*tempdir = talloc_asprintf(mem_ctx, "torture.tmp-%s.XXXXXX", prefix);
+	const char *basedir = lp_parm_string(-1, "torture", "basedir");
+	if (basedir == NULL) basedir = ".";
+	*tempdir = talloc_asprintf(mem_ctx, "%s/torture.tmp-%s.XXXXXX", 
+							   basedir, prefix);
 
 	if (mkdtemp(*tempdir) == NULL)
 		return NT_STATUS_UNSUCCESSFUL;