X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ferr%2Ftest%2Frun.c;h=aeaa3750b3d40ac7cc0223f24e4ae7fb4b0da42a;hb=ace6131ed7d12a48fc6f019a0d69e94f30c5cd3e;hp=c0407a9322b1c3e8fe60a454a497d6dbe4deee41;hpb=4776faf17adfa16ef5b2aeb24414b9d73a5789fc;p=ccan

diff --git a/ccan/err/test/run.c b/ccan/err/test/run.c
index c0407a93..aeaa3750 100644
--- a/ccan/err/test/run.c
+++ b/ccan/err/test/run.c
@@ -1,4 +1,4 @@
-#include <ccan/err/err.h>
+#include <ccan/err/err.c>
 #include <ccan/tap/tap.h>
 #include <unistd.h>
 #include <string.h>
@@ -10,15 +10,27 @@
 
 #define BUFFER_MAX 1024
 
-int main(void)
+int main(int argc, char *argv[])
 {
 	int pfd[2];
+	const char *base;
 
-	plan_tests(20);
-	fflush(stdout);
+	(void)argc;
+	plan_tests(24);
+
+	err_set_progname(argv[0]);
+
+	/* In case it only prints out the basename of argv[0]. */
+	base = strrchr(argv[0], '/');
+	if (base)
+		base++;
+	else
+		base = argv[0];
 
 	/* Test err() in child */
-	pipe(pfd);
+	if (pipe(pfd))
+		abort();
+	fflush(stdout);
 	if (fork()) {
 		char buffer[BUFFER_MAX+1];
 		unsigned int i;
@@ -31,6 +43,7 @@ int main(void)
 				buffer[i] = '\0';
 				ok1(strstr(buffer, "running err:"));
 				ok1(strstr(buffer, strerror(ENOENT)));
+				ok1(strstr(buffer, base));
 				ok1(buffer[i-1] == '\n');
 				break;
 			}
@@ -48,7 +61,8 @@ int main(void)
 	}
 
 	/* Test errx() in child */
-	pipe(pfd);
+	if (pipe(pfd))
+		abort();
 	fflush(stdout);
 	if (fork()) {
 		char buffer[BUFFER_MAX+1];
@@ -61,6 +75,7 @@ int main(void)
 			if (read(pfd[0], buffer + i, 1) == 0) {
 				buffer[i] = '\0';
 				ok1(strstr(buffer, "running errx\n"));
+				ok1(strstr(buffer, base));
 				break;
 			}
 		}
@@ -77,7 +92,8 @@ int main(void)
 
 
 	/* Test warn() in child */
-	pipe(pfd);
+	if (pipe(pfd))
+		abort();
 	fflush(stdout);
 	if (fork()) {
 		char buffer[BUFFER_MAX+1];
@@ -91,6 +107,7 @@ int main(void)
 				buffer[i] = '\0';
 				ok1(strstr(buffer, "running warn:"));
 				ok1(strstr(buffer, strerror(ENOENT)));
+				ok1(strstr(buffer, base));
 				ok1(buffer[i-1] == '\n');
 				break;
 			}
@@ -108,7 +125,8 @@ int main(void)
 	}
 
 	/* Test warnx() in child */
-	pipe(pfd);
+	if (pipe(pfd))
+		abort();
 	fflush(stdout);
 	if (fork()) {
 		char buffer[BUFFER_MAX+1];
@@ -121,6 +139,7 @@ int main(void)
 			if (read(pfd[0], buffer + i, 1) == 0) {
 				buffer[i] = '\0';
 				ok1(strstr(buffer, "running warnx\n"));
+				ok1(strstr(buffer, base));
 				break;
 			}
 		}