From 2ba57fd1832a4bc3c4c652c08e5f62054ecab79b Mon Sep 17 00:00:00 2001 From: Christian Ambach Date: Fri, 18 Feb 2011 15:02:35 +0100 Subject: s4:smbtorture do not leave output directory around MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit calling smbtorture with no or invalid arguments left the temporary output directory around this patches removes the dead-end exit from usage and makes the logic go on until the final cleanup state is reached output directory will still be left around when test times out or testcases itself force an exit also make sure that the directory itself is deleted, not just the objects in it Signed-off-by: Matthias Dieter Wallnöfer Signed-off-by: Andrew Bartlett Autobuild-User: Matthias Dieter Wallnöfer Autobuild-Date: Mon Feb 21 11:35:30 CET 2011 on sn-devel-104 --- source4/torture/smbtorture.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'source4') diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c index cfa8b0f87d..62cf0abfb7 100644 --- a/source4/torture/smbtorture.c +++ b/source4/torture/smbtorture.c @@ -285,7 +285,7 @@ void torture_print_testsuites(bool structured) } } -_NORETURN_ static void usage(poptContext pc) +static void usage(poptContext pc) { poptPrintUsage(pc, stdout, 0); printf("\n"); @@ -341,7 +341,6 @@ _NORETURN_ static void usage(poptContext pc) print_structured_testsuite_list(); - exit(1); } _NORETURN_ static void max_runtime_handler(int sig) @@ -702,19 +701,17 @@ int main(int argc,char *argv[]) if (argc_new < 3) { printf("You must specify a test to run, or 'ALL'\n"); usage(pc); - exit(1); - } - + torture->results->returncode = 1; + } else if (!torture_parse_target(cmdline_lp_ctx, argv_new[1])) { /* Take the target name or binding. */ - if (!torture_parse_target(cmdline_lp_ctx, argv_new[1])) { usage(pc); - exit(1); - } - - for (i=2;iresults->returncode = 1; + } else { + for (i=2;i