Merge lp:~gl-az/percona-xtrabackup/2.1-testrun-summary into lp:percona-xtrabackup/2.1

[George Ormond Lorch III]

Added test status tracking and summary report at end of test run cycle to make it wasy to see what failed at a glance, similar to MTR.

[Laurynas Biveinis (laurynas-biveinis)]

Same comments as for the 2.0 MP.

review: Needs Fixing

[lp:~gl-az/percona-xtrabackup/2.1-testrun-summary]

610. By George Ormond Lorch III on 2013-06-06

Fixed issue in testrun.c where specifying testsuite would find the tests in the corredt directory but would still try to execute them out of ./t

Added test status tracking and summary report at end of test run cycle to make it wasy to see what passed, skipped and failed at a glance, similar to MTR.

Changed testrun.sh slightly to return same code out of testrun.sh as the test that was executed when only a single test was run.

Unmerged revisions

610. By George Ormond Lorch III on 2013-06-06

Fixed issue in testrun.c where specifying testsuite would find the tests in the corredt directory but would still try to execute them out of ./t

Added test status tracking and summary report at end of test run cycle to make it wasy to see what passed, skipped and failed at a glance, similar to MTR.

Changed testrun.sh slightly to return same code out of testrun.sh as the test that was executed when only a single test was run.

=== modified file 'test/testrun.c'
--- test/testrun.c	2013-01-11 13:00:50 +0000
+++ test/testrun.c	2013-06-03 18:33:30 +0000
@@ -41,6 +41,7 @@
   char *buf;
   size_t end_of_buf;
   size_t bufsz;
+  int status;
 };
 
 pid_t *childpid;
@@ -96,6 +97,7 @@
     (*cases)[i].buf= NULL;
     (*cases)[i].end_of_buf= 0;
     (*cases)[i].bufsz= 0;
+    (*cases)[i].status= 0;
     free(namelist[i]);
   }
 
@@ -113,6 +115,38 @@
   free(cases);
 }
 
+static void report_status(struct testcase *cases, int n)
+{
+  int i;
+  int failed=0;
+  int skipped=0;
+  for (i=0; i<n; i++)
+    if (WEXITSTATUS(cases[i].status) != 0)
+      if (WEXITSTATUS(cases[i].status) == 200)
+        skipped++;
+      else
+        failed++;
+
+  printf("SUMMARY: %d run, %d successful, %d skipped, %d failed\n", n, n - failed - skipped, skipped, failed);
+  if (skipped)
+  {
+    printf("Skipped cases:");
+    for (i=0; i<n; i++) 
+      if (WEXITSTATUS(cases[i].status) == 200)
+        printf(" %s", cases[i].name);
+    printf("\n");
+  }
+
+  if (failed)
+  {
+    printf("Failing cases:");
+    for (i=0; i<n; i++) 
+      if (WEXITSTATUS(cases[i].status) != 0)
+        printf(" %s", cases[i].name);
+    printf("\n");
+  }
+}
+
 static int run_testcase_in_child(int nr, struct testcase *t, pid_t *cpid, const char* xbtarget)
 {
   int fd[2];
@@ -202,7 +236,6 @@
   int nfds= 0;
   int retval;
   pid_t chpid[njobs];
-  int status;
   int next_testcase= 0;
   int i;
   fd_set rfds;
@@ -277,8 +310,8 @@
 	    t->end_of_buf+= r;
 	} while(r>0);
 
-	pid_t waited= waitpid(childpid[i], &status, WNOHANG);
-	if (!(WIFEXITED(status) || WIFSIGNALED(status)))
+	pid_t waited= waitpid(childpid[i], &testcases[childtest[i]].status, WNOHANG);
+	if (!(WIFEXITED(testcases[childtest[i]].status) || WIFSIGNALED(testcases[childtest[i]].status)))
 	  continue;
 
 	if (waited != childpid[i])
@@ -289,7 +322,7 @@
 
 	close(childfd[i]);
 	printf("[%d] completed %s status %d\n",
-	       i, testcases[childtest[i]].name, WEXITSTATUS(status));
+	       i, testcases[childtest[i]].name, WEXITSTATUS(testcases[childtest[i]].status));
 	childfd[i]=-1;
 	nchildren--;
 
@@ -399,6 +432,8 @@
 
   run_testcases(testcases, nrcases, njobs, timeout, xbtarget);
 
+  report_status(testcases, nrcases);
+
   free_testcases(testcases, nrcases);
 
   return 0;