Merge lp:~jelmer/subunit/c-progress into lp:~subunit/subunit/trunk

[Jelmer Vernooij]

This adds a subunit_progress() function. We already have this in Samba's libtorture, but it seems to make more sense for it to be upstream.

[Robert Collins (lifeless)]

Thanks for this; I'd like you to split the different test calls up so
there is no ambiguity that each call produces separate output.

[Jelmer Vernooij (jelmer)]

On Tue, 2010-09-28 at 20:18 +0000, Robert Collins wrote:
> Thanks for this; I'd like you to split the different test calls up so
> there is no ambiguity that each call produces separate output.
I've pushed a new version.

[lp:~jelmer/subunit/c-progress]

134. By Jelmer Vernooij on 2010-09-28

Split up progress tests.

[Robert Collins (lifeless)]

Land It!

=== modified file 'c/include/subunit/child.h'
--- c/include/subunit/child.h	2009-10-02 22:26:44 +0000
+++ c/include/subunit/child.h	2010-09-28 20:32:46 +0000
@@ -74,6 +74,23 @@
 			      char const * const reason);
 
 
+enum subunit_progress_whence {
+	SUBUNIT_PROGRESS_SET,
+	SUBUNIT_PROGRESS_CUR,
+	SUBUNIT_PROGRESS_POP,
+	SUBUNIT_PROGRESS_PUSH,
+};
+
+/**
+ * subunit_progress:
+ *
+ * Report the progress of a test run.
+ * @whence: The type of progress update to report.
+ * @offset: Offset of the progress (only for SUBUNIT_PROGRESS_SET
+ * 			and SUBUNIT_PROGRESS_CUR).
+ */
+extern void subunit_progress(enum subunit_progress_whence whence, int offset);
+
 #ifdef __cplusplus
 }
 #endif

=== modified file 'c/lib/child.c'
--- c/lib/child.c	2009-10-02 22:26:44 +0000
+++ c/lib/child.c	2010-09-28 20:32:46 +0000
@@ -80,3 +80,25 @@
 {
   subunit_send_event("skip", name, reason);
 }
+
+void
+subunit_progress(enum subunit_progress_whence whence, int offset)
+{
+	switch (whence) {
+	case SUBUNIT_PROGRESS_SET:
+		printf("progress: %d\n", offset);
+		break;
+	case SUBUNIT_PROGRESS_CUR:
+		printf("progress: %+-d\n", offset);
+		break;
+	case SUBUNIT_PROGRESS_POP:
+		printf("progress: pop\n");
+		break;
+	case SUBUNIT_PROGRESS_PUSH:
+		printf("progress: push\n");
+		break;
+	default:
+		fprintf(stderr, "Invalid whence %d in subunit_progress()\n", whence);
+		break;
+	}
+}

=== modified file 'c/tests/test_child.c'
--- c/tests/test_child.c	2009-10-02 22:26:44 +0000
+++ c/tests/test_child.c	2010-09-28 20:32:46 +0000
@@ -164,6 +164,44 @@
 }
 END_TEST
 
+
+static void
+call_test_progress_pop(void)
+{
+	subunit_progress(SUBUNIT_PROGRESS_POP, 0);
+}
+
+static void
+call_test_progress_set(void)
+{
+	subunit_progress(SUBUNIT_PROGRESS_SET, 5);
+}
+
+static void
+call_test_progress_push(void)
+{
+	subunit_progress(SUBUNIT_PROGRESS_PUSH, 0);
+}
+
+static void
+call_test_progress_cur(void)
+{
+	subunit_progress(SUBUNIT_PROGRESS_CUR, -6);
+}
+
+START_TEST (test_progress)
+{
+	test_stdout_function("progress: pop\n",
+			 call_test_progress_pop);
+	test_stdout_function("progress: push\n",
+			 call_test_progress_push);
+	test_stdout_function("progress: 5\n",
+			 call_test_progress_set);
+	test_stdout_function("progress: -6\n",
+			 call_test_progress_cur);
+}
+END_TEST
+
 static Suite *
 child_suite(void)
 {
@@ -175,6 +213,7 @@
     tcase_add_test (tc_core, test_fail);
     tcase_add_test (tc_core, test_error);
     tcase_add_test (tc_core, test_skip);
+    tcase_add_test (tc_core, test_progress);
     return s;
 }