[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2-469-g72c266f

[Service Account]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".

The branch, master has been updated
       via  72c266f9eca8697e60384897b339f54b334be3f9 (commit)
      from  6ab817f8ef69c02509cf423ae53121ea64c55685 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/72c266f9eca8697e60384897b339f54b334be3f9

commit 72c266f9eca8697e60384897b339f54b334be3f9
Author: Hajime Fujita <hajime.fujita at intel.com>
Date:   Tue Sep 20 14:28:15 2016 -0500

    test/mpi: Fix error messages in uoplong
    
    Fix minor typo and use a variable to store the expected test output
    rather than recalculate on error.
    
    Signed-off-by: Ken Raffenetti <raffenet at mcs.anl.gov>

diff --git a/test/mpi/coll/uoplong.c b/test/mpi/coll/uoplong.c
index 280a8a7..ab8a43f 100644
--- a/test/mpi/coll/uoplong.c
+++ b/test/mpi/coll/uoplong.c
@@ -45,7 +45,7 @@ int main(int argc, char *argv[])
     int wsize, wrank, i, count;
     MPI_Datatype tripleType;
     double *inVal, *outVal;
-    double maxval, sumval;
+    double maxval, sumval, minval;
     MPI_Op op;
 
     MTest_Init(&argc, &argv);
@@ -62,7 +62,7 @@ int main(int argc, char *argv[])
         inVal = (double *) malloc(3 * count * sizeof(double));
         outVal = (double *) malloc(3 * count * sizeof(double));
         if (!inVal || !outVal) {
-            fprintf(stderr, "Unable to allocated %d words for data\n", 3 * count);
+            fprintf(stderr, "Unable to allocate %d words for data\n", 3 * count);
             MPI_Abort(MPI_COMM_WORLD, 1);
         }
         for (i = 0; i < count * 3; i++) {
@@ -75,6 +75,7 @@ int main(int argc, char *argv[])
             for (i = 0; i < 3 * count; i += 3) {
                 sumval = wsize * (1 + (i & 0x3));
                 maxval = 1 + ((i + 1) & 0x3);
+                minval = 1 + ((i + 2) & 0x3);
                 if (outVal[i] != sumval) {
                     if (errs < MAX_ERRS)
                         fprintf(stderr, "%d: outval[%d] = %f, expected %f (sum)\n",
@@ -87,10 +88,10 @@ int main(int argc, char *argv[])
                                 count, i + 1, outVal[i + 1], maxval);
                     errs++;
                 }
-                if (outVal[i + 2] != 1 + ((i + 2) & 0x3)) {
+                if (outVal[i + 2] != minval) {
                     if (errs < MAX_ERRS)
                         fprintf(stderr, "%d: outval[%d] = %f, expected %f (min)\n",
-                                count, i + 2, outVal[i + 2], (double) (1 + ((i + 2) ^ 0x3)));
+                                count, i + 2, outVal[i + 2], minval);
                     errs++;
                 }
             }

-----------------------------------------------------------------------

Summary of changes:
 test/mpi/coll/uoplong.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
MPICH primary repository