Changeset 745 for trunk/server/lib/torture/subunit.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• lib/torture/subunit.c (modified) (3 diffs)

trunk/server/lib/torture/subunit.c

@@ -20 +20 @@
 #include "includes.h"
 #include "lib/torture/torture.h"
+#include <subunit/child.h>
 
-static void subunit_suite_start(struct torture_context *ctx,
+static void torture_subunit_suite_start(struct torture_context *ctx,
                                 struct torture_suite *suite)
 {
 }
 
-static void subunit_print_testname(struct torture_context *ctx, 
+static char *torture_subunit_test_name(struct torture_context *ctx,
                                    struct torture_tcase *tcase,
                                    struct torture_test *test)
 {
         if (!strcmp(tcase->name, test->name)) {
-                printf("%s", test->name);
+                return talloc_strdup(ctx, test->name);
         } else {
-                printf("%s.%s", tcase->name, test->name);
+                return talloc_asprintf(ctx, "%s.%s", tcase->name, test->name);
         }
 }
 
-static void subunit_test_start(struct torture_context *ctx, 
+static void torture_subunit_report_time(struct torture_context *tctx)
+{
+        struct timespec tp;
+        struct tm *tmp;
+        char timestr[200];
+        if (clock_gettime(CLOCK_REALTIME, &tp) != 0) {
+                perror("clock_gettime");
+                return;
+        }
+
+        tmp = localtime(&tp.tv_sec);
+        if (!tmp) {
+                perror("localtime");
+                return;
+        }
+
+        if (strftime(timestr, sizeof(timestr), "%Y-%m-%d %H:%M:%S", tmp) <= 0) {
+                perror("strftime");
+                return;
+        }
+
+        printf("time: %s.%06ld\n", timestr, tp.tv_nsec / 1000);
+}
+
+static void torture_subunit_test_start(struct torture_context *context, 
                                struct torture_tcase *tcase,
                                struct torture_test *test)
 {
-        printf("test: ");
-        subunit_print_testname(ctx, tcase, test);       
-        printf("\n");
+        char *fullname = torture_subunit_test_name(context, context->active_tcase, context->active_test);
+        subunit_test_start(fullname);
+        torture_subunit_report_time(context);
+        talloc_free(fullname);
 }
 
-static void subunit_test_result(struct torture_context *context, 
+static void torture_subunit_test_result(struct torture_context *context, 
                                 enum torture_result res, const char *reason)
 {
+        char *fullname = torture_subunit_test_name(context, context->active_tcase, context->active_test);
+        torture_subunit_report_time(context);
         switch (res) {
         case TORTURE_OK:
-                printf("success: ");
+                subunit_test_pass(fullname);
                 break;
         case TORTURE_FAIL:
-                printf("failure: ");
+                subunit_test_fail(fullname, reason);
                 break;
         case TORTURE_ERROR:
-                printf("error: ");
+                subunit_test_error(fullname, reason);
                 break;
         case TORTURE_SKIP:
-                printf("skip: ");
+                subunit_test_skip(fullname, reason);
                 break;
         }
-        subunit_print_testname(context, context->active_tcase, context->active_test);   
-
-        if (reason)
-                printf(" [\n%s\n]", reason);
-        printf("\n");
+        talloc_free(fullname);
 }
 
-static void subunit_comment(struct torture_context *test,
+static void torture_subunit_comment(struct torture_context *test,
                             const char *comment)
 {
@@ -76 +100 @@
 }
 
-static void subunit_warning(struct torture_context *test,
+static void torture_subunit_warning(struct torture_context *test,
                             const char *comment)
 {
@@ -82 +106 @@
 }
 
+static void torture_subunit_progress(struct torture_context *tctx, int offset, enum torture_progress_whence whence)
+{
+        switch (whence) {
+        case TORTURE_PROGRESS_SET:
+                printf("progress: %d\n", offset);
+                break;
+        case TORTURE_PROGRESS_CUR:
+                printf("progress: %+-d\n", offset);
+                break;
+        case TORTURE_PROGRESS_POP:
+                printf("progress: pop\n");
+                break;
+        case TORTURE_PROGRESS_PUSH:
+                printf("progress: push\n");
+                break;
+        default:
+                fprintf(stderr, "Invalid call to progress()\n");
+                break;
+        }
+}
+
 const struct torture_ui_ops torture_subunit_ui_ops = {
-        .comment = subunit_comment,
-        .warning = subunit_warning,
-        .test_start = subunit_test_start,
-        .test_result = subunit_test_result,
-        .suite_start = subunit_suite_start
+        .comment = torture_subunit_comment,
+        .warning = torture_subunit_warning,
+        .test_start = torture_subunit_test_start,
+        .test_result = torture_subunit_test_result,
+        .suite_start = torture_subunit_suite_start,
+        .progress = torture_subunit_progress,
+        .report_time = torture_subunit_report_time,
 };