r19343: Add support for external scripts/binaries that write results using the

'subunit' protocol. This allows us to easily plug EJS scripts or binaries that
can't depend on -ltorture into smbtorture. The protocol is very simple:

- write "comments" to stderr

Example output on stdout:
test: foo
success: foo
test: bar
success: bar
test: blah
failure: blah [
dummy.c:30: Expression 1 != 2 failed!
]
test: blie
skip: blie [
Iconv support not built in
]

I've already converted the talloc testsuite.
(This used to be commit e1742c14a247fabba969f8698108e73997d3f420)

1 files changed, 239 insertions, 0 deletions

diff --git a/source4/torture/subunit.c b/source4/torture/subunit.c
new file mode 100644
index 0000000000..72e39101e2
--- /dev/null
+++ b/source4/torture/subunit.c
@@ -0,0 +1,239 @@
+/* 
+   Unix SMB/CIFS implementation.
+   Run subunit tests
+   Copyright (C) Jelmer Vernooij 2006
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+#include "system/dir.h"
+#include "system/network.h"
+#include "system/filesys.h"
+#include "torture/ui.h"
+#include "torture/proto.h"
+
+NTSTATUS torture_register_subunit_testsuite(const char *path)
+{
+	struct torture_suite *suite = talloc_zero(talloc_autofree_context(), 
+											  struct torture_suite);
+
+	suite->path = talloc_strdup(suite, path);
+	suite->name = talloc_strdup(suite, strrchr(path, '/')?strrchr(path, '/')+1:
+									   path);
+	suite->description = talloc_asprintf(suite, "Subunit test %s", suite->name);
+
+	return torture_register_suite(suite);
+}
+
+int torture_subunit_load_testsuites(const char *directory)
+{
+	DIR *dir;
+	struct dirent *entry;
+	char *filename;
+	int success = 0;
+
+	dir = opendir(directory);
+	if (dir == NULL)
+		return -1;
+
+	while((entry = readdir(dir))) {
+		if (ISDOT(entry->d_name) || ISDOTDOT(entry->d_name))
+			continue;
+
+		filename = talloc_asprintf(NULL, "%s/%s", directory, entry->d_name);
+	
+		if (NT_STATUS_IS_OK(torture_register_subunit_testsuite(filename))) {
+			success++;
+		}
+
+		talloc_free(filename);
+	}
+
+	closedir(dir);
+
+	return success;
+}
+
+static pid_t piped_child(char* const command[], int *f_in)
+{
+	pid_t pid;
+	int sock[2];
+
+	if (socketpair(PF_UNIX, SOCK_STREAM, AF_LOCAL, sock) == -1) {
+		DEBUG(0, ("socketpair: %s", strerror(errno)));
+		return -1;
+	}
+
+	*f_in = sock[0];
+
+	fcntl(sock[0], F_SETFL, O_NONBLOCK);
+
+	pid = fork();
+
+	if (pid == -1) {
+		DEBUG(0, ("fork: %s", strerror(errno)));
+		return -1;
+	}
+
+	if (pid == 0) {
+		close(0);
+		close(1);
+		close(2);
+		close(sock[0]);
+
+		dup2(sock[1], 0);
+		dup2(sock[1], 1);
+		execvp(command[0], command);
+		exit(-1);
+	}
+
+	close(sock[1]);
+
+	return pid;
+}
+
+enum subunit_field { SUBUNIT_TEST, SUBUNIT_SUCCESS, SUBUNIT_FAILURE, 
+					 SUBUNIT_SKIP };
+
+static void run_subunit_message(struct torture_context *context,
+								enum subunit_field field, 
+								const char *name, 
+								const char *comment)
+{
+	struct torture_test test;
+
+	ZERO_STRUCT(test);
+	test.name = name;
+
+	switch (field) {
+	case SUBUNIT_TEST:
+		torture_ui_test_start(context, NULL, &test);
+		break;
+	case SUBUNIT_FAILURE:
+		context->active_test = &test;
+		torture_ui_test_result(context, TORTURE_FAIL, comment);
+		context->active_test = NULL;
+		break;
+	case SUBUNIT_SUCCESS:
+		context->active_test = &test;
+		torture_ui_test_result(context, TORTURE_OK, comment);
+		context->active_test = NULL;
+		break;
+	case SUBUNIT_SKIP:
+		context->active_test = &test;
+		torture_ui_test_result(context, TORTURE_SKIP, comment);
+		context->active_test = NULL;
+		break;
+	}
+}
+
+bool torture_subunit_run_suite(struct torture_context *context, 
+					   struct torture_suite *suite)
+{
+	static char *command[2];
+	int fd;
+	pid_t pid;
+	size_t size;
+	char *p, *q;
+	char *comment = NULL;
+	char *name = NULL;
+	enum subunit_field lastfield;
+	int status;
+	char buffer[4096];
+	size_t offset = 0;
+
+	command[0] = talloc_strdup(context, suite->path);
+	command[1] = NULL;
+
+	pid = piped_child(command, &fd);
+	if (pid == -1)
+		return false;
+
+	if (waitpid(pid, &status, 0) == -1) {
+		torture_comment(context, "waitpid(%d) failed\n", pid);
+		return false;
+	}
+
+	if (WEXITSTATUS(status) != 0) {
+		torture_comment(context, "failed with status %d\n", WEXITSTATUS(status));
+		return false;
+	}
+
+	while ((size = read(fd, buffer+offset, sizeof(buffer-offset) > 0))) {
+		char *eol;
+		buffer[offset+size] = '\0';
+
+		for (p = buffer; p; p = eol+1) {
+			eol = strchr(p, '\n');
+			if (eol == NULL) 
+				break;
+
+			*eol = '\0';
+
+			if (comment != NULL && strcmp(p, "]") == 0) {
+				run_subunit_message(context, lastfield, name, comment);
+				talloc_free(name); name = NULL;
+				talloc_free(comment); comment = NULL;
+			} else if (comment != NULL) {
+				comment = talloc_append_string(context, comment, p);
+			} else {
+				q = strchr(p, ':');
+				if (q == NULL) {
+					torture_comment(context, "Invalid line `%s'\n", p);
+					continue;
+				}
+
+				*q = '\0';
+				if (!strcmp(p, "test")) {
+					lastfield = SUBUNIT_TEST;
+				} else if (!strcmp(p, "failure")) {
+					lastfield = SUBUNIT_FAILURE;
+				} else if (!strcmp(p, "success")) {
+					lastfield = SUBUNIT_SUCCESS;
+				} else if (!strcmp(p, "skip")) {
+					lastfield = SUBUNIT_SKIP;
+				} else {
+					torture_comment(context, "Invalid subunit field `%s'\n", p);
+					continue;
+				}
+
+				p = q+1;
+
+				name = talloc_strdup(context, p+1);
+
+				q = strrchr(p, '[');
+				if (q != NULL) {
+					*q = '\0';
+					comment = talloc_strdup(context, "");
+				} else {
+					run_subunit_message(context, lastfield, name, NULL);
+					talloc_free(name);
+					name = NULL;
+				}
+			}
+		}
+
+		offset += size-(p-buffer);
+		memcpy(buffer, p, offset);
+	}
+
+	if (name != NULL) {
+		torture_comment(context, "Interrupted during %s\n", name);
+		return false;
+	}
+
+	return true;
+}