Adding upstream version 3.2.7.upstream/3.2.7

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 61 insertions, 0 deletions

diff --git a/testrun.c b/testrun.c
new file mode 100644
index 0000000..049e3eb
--- /dev/null
+++ b/testrun.c
@@ -0,0 +1,61 @@
+/* Run a testsuite script with a timeout. */
+
+#include "rsync.h"
+
+#define DEFAULT_TIMEOUT_SECS (5*60)
+#define TIMEOUT_ENV "TESTRUN_TIMEOUT"
+
+ int main(int argc, char *argv[])
+{
+	pid_t pid;
+	char *timeout_env;
+	int status, timeout_secs, slept = 0;
+
+	if (argc < 2) {
+		fprintf(stderr, "Usage: testrun [SHELL_OPTIONS] TESTSUITE_SCRIPT [ARGS]\n");
+		exit(1);
+	}
+
+	if ((timeout_env = getenv(TIMEOUT_ENV)) != NULL)
+		timeout_secs = atoi(timeout_env);
+	else
+		timeout_secs = DEFAULT_TIMEOUT_SECS;
+
+	if ((pid = fork()) < 0) {
+		fprintf(stderr, "TESTRUN ERROR: fork failed: %s\n", strerror(errno));
+		exit(1);
+	}
+
+	if (pid == 0) {
+		argv[0] = "sh";
+		execvp(argv[0], argv);
+		fprintf(stderr, "TESTRUN ERROR: failed to exec %s: %s\n", argv[0], strerror(errno));
+		_exit(1);
+	}
+
+	while (1) {
+		int ret = waitpid(pid, &status, WNOHANG);
+		if (ret > 0)
+			break;
+		if (ret < 0) {
+			if (errno == EINTR)
+				continue;
+			fprintf(stderr, "TESTRUN ERROR: waitpid failed: %s\n", strerror(errno));
+			exit(1);
+		}
+		if (slept++ > timeout_secs) {
+			fprintf(stderr, "TESTRUN TIMEOUT: test took over %d seconds.\n", timeout_secs);
+			if (kill(pid, SIGTERM) < 0)
+				fprintf(stderr, "TESTRUN ERROR: failed to kill pid %d: %s\n", (int)pid, strerror(errno));
+			else
+				fprintf(stderr, "TESTRUN INFO: killed pid %d\n", (int)pid);
+			exit(1);
+		}
+		sleep(1);
+	}
+
+	if (!WIFEXITED(status))
+		exit(255);
+
+	return WEXITSTATUS(status);
+}