svn commit: samba r21055 - in branches/SAMBA_4_0: . source/script
source/torture
jelmer at samba.org
jelmer at samba.org
Tue Jan 30 12:10:43 GMT 2007
Author: jelmer
Date: 2007-01-30 12:10:42 +0000 (Tue, 30 Jan 2007)
New Revision: 21055
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21055
Log:
Fix executable bit.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/script/buildtree.pl
branches/SAMBA_4_0/source/script/installjsonrpc.sh
branches/SAMBA_4_0/source/script/installwebapps.sh
branches/SAMBA_4_0/source/torture/smbtorture.c
branches/SAMBA_4_0/source/torture/torture.c
branches/SAMBA_4_0/source/torture/ui.c
branches/SAMBA_4_0/source/torture/ui.h
Changeset:
Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:merge
- jelmer at samba.org-20060824212938-5923465160f6ab63
jelmer at samba.org-20060830112659-186f132eebc987cc
jelmer at samba.org-20060904121718-63b73248146c14f8
jelmer at samba.org-20060904124721-5e70ab0bd405f748
metze at samba.org-20061010151401-45a5a2ed52cfe172
jelmer at samba.org-20061016130323-400ce51ee51ab30e
jelmer at samba.org-20061016195822-c7783d3ea1a56a53
jelmer at samba.org-20061016230421-75bca2ad62945ede
jelmer at samba.org-20061017145110-8c83a3dd979f6a6a
jelmer at samba.org-20061029173623-eb0459f1d3eb5720
jelmer at samba.org-20070115022006-h5ef1deqflt940b6
jelmer at samba.org-20070116142934-hv99dpwbnq2znh8f
jelmer at samba.org-20070116144126-70rip3bppmvgs3t6
jelmer at samba.org-20070116151516-imvui4r33cj850j9
jelmer at samba.org-20070116154739-3tji4fft7964qgrj
jelmer at samba.org-20070116173900-iasa25stcfty6pbr
jelmer at samba.org-20070117144550-te3o0iy10y14iyo4
jelmer at samba.org-20070122000024-q911packyrjk69ud
jelmer at samba.org-20070122181120-3n8ah238pjbzylyo
jelmer at samba.org-20070122182054-6b26fqrdqyjhyeuc
jelmer at samba.org-20070122233549-k085tfo2o1eqz7mm
jelmer at samba.org-20070123002251-0smz35eva10x84tc
jelmer at samba.org-20070123003546-p0jl6j9tw79q5j1k
jelmer at samba.org-20070123012404-o9w5pmgkm94zsxlu
jelmer at samba.org-20070123094731-ns7dzzzqtb0dlcod
jelmer at samba.org-20070125123431-g3pqm92r31ez9xyc
jelmer at samba.org-20070126125959-3w3t26aps9hmwukv
jelmer at samba.org-20070126132607-64kt7rc2wtqh0c7u
jelmer at samba.org-20070126133903-onfotbg1051ktojo
jelmer at samba.org-20070126144259-171b4t0744jigs5x
jelmer at samba.org-20070126152205-xj7j1avc7683rjy5
jelmer at samba.org-20070128010235-e8st47gcy00ii8kc
jelmer at samba.org-20070128130853-xjjrlrtf830pwnx6
+ jelmer at samba.org-20060824212938-5923465160f6ab63
jelmer at samba.org-20060830112659-186f132eebc987cc
jelmer at samba.org-20060904121718-63b73248146c14f8
jelmer at samba.org-20060904124721-5e70ab0bd405f748
metze at samba.org-20061010151401-45a5a2ed52cfe172
jelmer at samba.org-20061016130323-400ce51ee51ab30e
jelmer at samba.org-20061016195822-c7783d3ea1a56a53
jelmer at samba.org-20061016230421-75bca2ad62945ede
jelmer at samba.org-20061017145110-8c83a3dd979f6a6a
jelmer at samba.org-20061029173623-eb0459f1d3eb5720
jelmer at samba.org-20070115022006-h5ef1deqflt940b6
jelmer at samba.org-20070116142934-hv99dpwbnq2znh8f
jelmer at samba.org-20070116144126-70rip3bppmvgs3t6
jelmer at samba.org-20070116151516-imvui4r33cj850j9
jelmer at samba.org-20070116154739-3tji4fft7964qgrj
jelmer at samba.org-20070116173900-iasa25stcfty6pbr
jelmer at samba.org-20070117144550-te3o0iy10y14iyo4
jelmer at samba.org-20070122000024-q911packyrjk69ud
jelmer at samba.org-20070122181120-3n8ah238pjbzylyo
jelmer at samba.org-20070122182054-6b26fqrdqyjhyeuc
jelmer at samba.org-20070122233549-k085tfo2o1eqz7mm
jelmer at samba.org-20070123002251-0smz35eva10x84tc
jelmer at samba.org-20070123003546-p0jl6j9tw79q5j1k
jelmer at samba.org-20070123012404-o9w5pmgkm94zsxlu
jelmer at samba.org-20070123094731-ns7dzzzqtb0dlcod
jelmer at samba.org-20070125123431-g3pqm92r31ez9xyc
jelmer at samba.org-20070126125959-3w3t26aps9hmwukv
jelmer at samba.org-20070126132607-64kt7rc2wtqh0c7u
jelmer at samba.org-20070126133903-onfotbg1051ktojo
jelmer at samba.org-20070126144259-171b4t0744jigs5x
jelmer at samba.org-20070126152205-xj7j1avc7683rjy5
jelmer at samba.org-20070128010235-e8st47gcy00ii8kc
jelmer at samba.org-20070128130853-xjjrlrtf830pwnx6
jelmer at samba.org-20070130120806-gfqshokma9j6j3uv
Modified: branches/SAMBA_4_0/source/script/buildtree.pl
===================================================================
Property changes on: branches/SAMBA_4_0/source/script/buildtree.pl
___________________________________________________________________
Name: svn:executable
+ *
Modified: branches/SAMBA_4_0/source/script/installjsonrpc.sh
===================================================================
Property changes on: branches/SAMBA_4_0/source/script/installjsonrpc.sh
___________________________________________________________________
Name: svn:executable
+ *
Modified: branches/SAMBA_4_0/source/script/installwebapps.sh
===================================================================
Property changes on: branches/SAMBA_4_0/source/script/installwebapps.sh
___________________________________________________________________
Name: svn:executable
+ *
Modified: branches/SAMBA_4_0/source/torture/smbtorture.c
===================================================================
--- branches/SAMBA_4_0/source/torture/smbtorture.c 2007-01-30 02:27:29 UTC (rev 21054)
+++ branches/SAMBA_4_0/source/torture/smbtorture.c 2007-01-30 12:10:42 UTC (rev 21055)
@@ -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: branches/SAMBA_4_0/source/torture/torture.c
===================================================================
--- branches/SAMBA_4_0/source/torture/torture.c 2007-01-30 02:27:29 UTC (rev 21054)
+++ branches/SAMBA_4_0/source/torture/torture.c 2007-01-30 12:10:42 UTC (rev 21055)
@@ -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: branches/SAMBA_4_0/source/torture/ui.c
===================================================================
--- branches/SAMBA_4_0/source/torture/ui.c 2007-01-30 02:27:29 UTC (rev 21054)
+++ branches/SAMBA_4_0/source/torture/ui.c 2007-01-30 12:10:42 UTC (rev 21055)
@@ -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: branches/SAMBA_4_0/source/torture/ui.h
===================================================================
--- branches/SAMBA_4_0/source/torture/ui.h 2007-01-30 02:27:29 UTC (rev 21054)
+++ branches/SAMBA_4_0/source/torture/ui.h 2007-01-30 12:10:42 UTC (rev 21055)
@@ -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