Index: tests/meta/.expect/fork+exec.txt
===================================================================
--- tests/meta/.expect/fork+exec.txt	(revision 68456fa6a7423f68fd1147107ae8c7ba4f157d44)
+++ tests/meta/.expect/fork+exec.txt	(revision 38cc59fdd761fd9cccb2a07463860b60e64df28f)
@@ -4,12 +4,6 @@
 Success!
 Child status:
-    WIFEXITED   : 1
-    WEXITSTATUS : 0
-    WIFSIGNALED : 0
-    WTERMSIG    : 0
-    WCOREDUMP   : 0
-    WIFSTOPPED  : 0
-    WSTOPSIG    : 0
-    WIFCONTINUED: 0
+IFEXITED   : 1, EXITSTATUS : 0, IFSIGNALED : 0, TERMSIG    : 0, COREDUMP   : 0, IFSTOPPED  : 0, STOPSIG    : 0, IFCONTINUED: 0
+
 1 arg:
 arguments are:
@@ -17,12 +11,6 @@
 Success!
 Child status:
-    WIFEXITED   : 1
-    WEXITSTATUS : 0
-    WIFSIGNALED : 0
-    WTERMSIG    : 0
-    WCOREDUMP   : 0
-    WIFSTOPPED  : 0
-    WSTOPSIG    : 0
-    WIFCONTINUED: 0
+IFEXITED   : 1, EXITSTATUS : 0, IFSIGNALED : 0, TERMSIG    : 0, COREDUMP   : 0, IFSTOPPED  : 0, STOPSIG    : 0, IFCONTINUED: 0
+
 5 arg:
 arguments are:
@@ -34,11 +22,5 @@
 Success!
 Child status:
-    WIFEXITED   : 1
-    WEXITSTATUS : 0
-    WIFSIGNALED : 0
-    WTERMSIG    : 0
-    WCOREDUMP   : 0
-    WIFSTOPPED  : 0
-    WSTOPSIG    : 0
-    WIFCONTINUED: 0
+IFEXITED   : 1, EXITSTATUS : 0, IFSIGNALED : 0, TERMSIG    : 0, COREDUMP   : 0, IFSTOPPED  : 0, STOPSIG    : 0, IFCONTINUED: 0
+
 All Done!
Index: tests/meta/fork+exec.hfa
===================================================================
--- tests/meta/fork+exec.hfa	(revision 68456fa6a7423f68fd1147107ae8c7ba4f157d44)
+++ tests/meta/fork+exec.hfa	(revision 38cc59fdd761fd9cccb2a07463860b60e64df28f)
@@ -28,5 +28,5 @@
 }
 
-static int true_main(const char * exec, char * env[]);
+static int true_main(const char * path, char * env[]);
 
 static int do_wait(pid_t pid) {
@@ -55,12 +55,14 @@
 static void print_status(int wstatus) {
 	printf("Child status:\n");
-	printf("    WIFEXITED   : %d\n", WIFEXITED(wstatus));
-	printf("    WEXITSTATUS : %d\n", WEXITSTATUS(wstatus));
-	printf("    WIFSIGNALED : %d\n", WIFSIGNALED(wstatus));
-	printf("    WTERMSIG    : %d\n", WTERMSIG(wstatus));
-	printf("    WCOREDUMP   : %d\n", WCOREDUMP(wstatus));
-	printf("    WIFSTOPPED  : %d\n", WIFSTOPPED(wstatus));
-	printf("    WSTOPSIG    : %d\n", WSTOPSIG(wstatus));
-	printf("    WIFCONTINUED: %d\n", WIFCONTINUED(wstatus));
+	printf("IFEXITED   : %d, ", WIFEXITED(wstatus));
+	printf("EXITSTATUS : %d, ", WEXITSTATUS(wstatus));
+	printf("IFSIGNALED : %d, ", WIFSIGNALED(wstatus));
+	printf("TERMSIG    : %d, ", WTERMSIG(wstatus));
+	printf("COREDUMP   : %d, ", WCOREDUMP(wstatus));
+	printf("IFSTOPPED  : %d, ", WIFSTOPPED(wstatus));
+	printf("STOPSIG    : %d, ", WSTOPSIG(wstatus));
+	printf("IFCONTINUED: %d", WIFCONTINUED(wstatus));
+	printf("\n");
+	printf("\n");
 }