diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-10-18 10:03:30 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:21:23 -0500 |
| commit | 1d3663c23077abab81c5a015b5c66ad0a274c882 (patch) | |
| tree | 94311b617b2fcfaa48ba9d6b07ee581ad3b318eb /source4/torture/ui.c | |
| parent | 43aa9f86f5c574f5dac70970f574a0c0a3c4eab1 (diff) | |
| download | samba-1d3663c23077abab81c5a015b5c66ad0a274c882.tar.gz samba-1d3663c23077abab81c5a015b5c66ad0a274c882.tar.bz2 samba-1d3663c23077abab81c5a015b5c66ad0a274c882.zip | |
r19387: Exit with 0 if failures were expected
(This used to be commit b4fc06aeafa3ed8460759409a72b4de43a534d62)
Diffstat (limited to 'source4/torture/ui.c')
| -rw-r--r-- | source4/torture/ui.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source4/torture/ui.c b/source4/torture/ui.c index 1e404d55ad..441e9ebbd7 100644 --- a/source4/torture/ui.c +++ b/source4/torture/ui.c @@ -142,7 +142,7 @@ BOOL torture_run_suite(struct torture_context *context, context->active_testname = talloc_strdup(context, suite->name); if (suite->path) - torture_subunit_run_suite(context, suite); + ret &= torture_subunit_run_suite(context, suite); for (tcase = suite->testcases; tcase; tcase = tcase->next) { ret &= torture_run_tcase(context, tcase); @@ -206,12 +206,14 @@ void torture_ui_test_result(struct torture_context *context, context->results.unexpected_errors, talloc_reference(context, context->active_testname)); context->results.errors++; + context->results.returncode = false; } else if (result == TORTURE_FAIL) { if (0 == str_list_match(context->active_testname, context->expected_failures)) { context->results.unexpected_failures = str_list_add( context->results.unexpected_failures, talloc_reference(context, context->active_testname)); + context->results.returncode = false; } context->results.failed++; } |