summaryrefslogtreecommitdiff
path: root/source4/torture/local
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-06-26 20:09:35 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:09:33 -0500
commit1afab0e36f87373805841bc80d2ab3b8437a5917 (patch)
treee9cdddb568e04950ab310a8086e38435416e20ca /source4/torture/local
parent6b749f225e8d1c910820a6576952f130e72bab84 (diff)
downloadsamba-1afab0e36f87373805841bc80d2ab3b8437a5917.tar.gz
samba-1afab0e36f87373805841bc80d2ab3b8437a5917.tar.bz2
samba-1afab0e36f87373805841bc80d2ab3b8437a5917.zip
r16527: Add target argument for smbtorture.
Remove duplicate unc path separator conversion. Add prefix for tempdirs. (This used to be commit 3763ed3092fa89558390a9721be8437a7c380790)
Diffstat (limited to 'source4/torture/local')
-rw-r--r--source4/torture/local/torture.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source4/torture/local/torture.c b/source4/torture/local/torture.c
index 76581540a1..0a2fdc2b2b 100644
--- a/source4/torture/local/torture.c
+++ b/source4/torture/local/torture.c
@@ -30,7 +30,7 @@ static BOOL test_tempdir(struct torture_context *torture,
{
char *location = NULL;
- torture_assert_ntstatus_ok(torture, torture_temp_dir(torture, &location),
+ torture_assert_ntstatus_ok(torture, torture_temp_dir(torture, "tempdir", &location),
"torture_temp_dir should return NT_STATUS_OK" );
torture_assert(torture, directory_exist(location),
@@ -45,6 +45,7 @@ static BOOL test_setup_server(struct torture_context *torture,
pid_t pid;
torture_assert_ntstatus_ok(torture, torture_setup_server(torture,
+ "setupserver-success",
"./script/tests/mktestsetup.sh",
"./bin/smbd", &pid),
"starting smbd failed");
@@ -58,6 +59,7 @@ static BOOL test_setup_server(struct torture_context *torture,
waitpid(pid, NULL, 0);
torture_assert_ntstatus_equal(torture, torture_setup_server(torture,
+ "setupserver-fail",
"./invalid-script",
"./bin/smbd", &pid),
NT_STATUS_UNSUCCESSFUL,