Rev 11338: Fix executable bit. in
file:///home/jelmer/bzr.samba/SAMBA_4_0/
Jelmer Vernooij
jelmer at samba.org
Tue Jan 30 12:08:16 GMT 2007
------------------------------------------------------------
revno: 11338
revision-id: jelmer at samba.org-20070130120806-gfqshokma9j6j3uv
parent: svn-v2:21048 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: SAMBA_4_0
timestamp: Tue 2007-01-30 13:08:06 +0100
message:
Fix executable bit.
modified:
source/script/buildtree.pl* svn-v2:15036 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2fbuildtree.pl
source/script/installjsonrpc.sh* svn-v2:19449 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2finstalljsonrpc.sh
source/script/installwebapps.sh* svn-v2:20444 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2finstallwebapps.sh
source/torture/smbtorture.c svn-v2:14520 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2ftorture%2fsmbtorture.c
source/torture/torture.c svn-v2:2 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-trunk-source%2ftorture%2ftorture.c
source/torture/ui.c svn-v2:14718 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2ftorture%2fui.c
source/torture/ui.h svn-v2:14718 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2ftorture%2fui.h
=== modified file 'source/script/buildtree.pl' (properties changed)
=== modified file 'source/script/installjsonrpc.sh' (properties changed)
=== modified file 'source/script/installwebapps.sh' (properties changed)
=== modified file 'source/torture/smbtorture.c'
--- a/source/torture/smbtorture.c 2007-01-28 13:14:52 +0000
+++ b/source/torture/smbtorture.c 2007-01-30 12:08:06 +0000
@@ -670,57 +670,14 @@
} else if (shell) {
run_shell(torture);
} else {
- int total;
- double rate;
- int unexpected_failures;
for (i=2;i<argc_new;i++) {
if (!run_test(torture, argv_new[i])) {
correct = false;
}
}
-
- unexpected_failures = str_list_length(torture->results.unexpected_failures);
-
- total = torture->results.skipped+torture->results.success+torture->results.failed+torture->results.errors;
- if (total == 0) {
- printf("No tests run.\n");
- } else {
- rate = ((total - unexpected_failures - torture->results.errors) * (100.0 / total));
-
- printf("Tests: %d, Failures: %d", total, torture->results.failed);
- if (torture->results.failed - unexpected_failures) {
- printf(" (%d expected)", torture->results.failed - unexpected_failures);
- }
- printf(", Errors: %d, Skipped: %d. Success rate: %.2f%%\n",
- torture->results.errors, torture->results.skipped, rate);
- }
-
- if (unexpected_failures) {
- printf("The following tests failed:\n");
- for (i = 0; torture->results.unexpected_failures[i]; i++) {
- printf(" %s\n", torture->results.unexpected_failures[i]);
- }
- printf("\n");
- }
-
- if (str_list_length(torture->results.unexpected_errors)) {
- printf("Errors occurred while running the following tests:\n");
- for (i = 0; torture->results.unexpected_errors[i]; i++) {
- printf(" %s\n", torture->results.unexpected_errors[i]);
- }
- printf("\n");
- }
-
- if (str_list_length(torture->results.unexpected_successes)) {
- printf("The following tests were expected to fail but succeeded:\n");
- for (i = 0; torture->results.unexpected_successes[i]; i++) {
- printf(" %s\n", torture->results.unexpected_successes[i]);
- }
- printf("\n");
- }
}
- if (torture->results.returncode) {
+ if (torture->returncode) {
return(0);
} else {
return(1);
=== modified file 'source/torture/torture.c'
--- a/source/torture/torture.c 2006-11-04 19:45:50 +0000
+++ b/source/torture/torture.c 2007-01-30 12:08:06 +0000
@@ -45,15 +45,10 @@
const char *known_failures_file,
const struct torture_ui_ops *ui_ops)
{
- int numlines;
struct torture_context *torture = talloc_zero(mem_ctx,
struct torture_context);
- torture->expected_failures = file_lines_load(known_failures_file, &numlines,
- torture);
torture->ui_ops = ui_ops;
- torture->results.returncode = true;
-
return torture;
}
=== modified file 'source/torture/ui.c'
--- a/source/torture/ui.c 2007-01-28 13:14:52 +0000
+++ b/source/torture/ui.c 2007-01-30 12:08:06 +0000
@@ -188,32 +188,8 @@
if (context->ui_ops->test_result)
context->ui_ops->test_result(context, result, comment);
- if (result == TORTURE_SKIP) {
- context->results.skipped++;
- } else if (result == TORTURE_OK) {
- if (str_list_match(context->active_testname,
- context->expected_failures)) {
- context->results.unexpected_successes = str_list_add(
- context->results.unexpected_successes,
- talloc_reference(context, context->active_testname));
- }
- context->results.success++;
- } else if (result == TORTURE_ERROR) {
- context->results.unexpected_errors = str_list_add(
- 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++;
- }
+ if (result == TORTURE_ERROR || result == TORTURE_FAIL)
+ context->returncode = false;
}
static BOOL internal_torture_run_test(struct torture_context *context,
=== modified file 'source/torture/ui.h'
--- a/source/torture/ui.h 2007-01-28 13:14:52 +0000
+++ b/source/torture/ui.h 2007-01-30 12:08:06 +0000
@@ -79,27 +79,13 @@
struct torture_test *active_test;
struct torture_tcase *active_tcase;
- char **expected_failures;
-
- struct torture_results {
- int skipped;
- int todo;
- int success;
- int failed;
- int errors;
-
- const char **unexpected_failures;
- const char **unexpected_successes;
- const char **unexpected_errors;
-
- bool returncode;
- } results;
-
bool quiet; /* Whether tests should avoid writing output to stdout */
enum torture_result last_result;
char *last_reason;
+ bool returncode;
+
char *outputdir;
int level;
};
More information about the samba-cvs
mailing list