[v2.3.x] fabtests/cq_data: Fix the error propagation

The current run_test() has a bug, that the
cq data check and cq data size check are setting
the same return code. That means when a cq data
check failed but cq data size check succeeds,
the return code will be still 0. This patch
fixes this issue by making the test return
error directly when any check failed.

Signed-off-by: Shi Jin <[email protected]>
(cherry picked from commit 0682ba4)

Author: shijin-aws

fabtests/functional/cq_data.c

@@ -90,28 +90,28 @@ static int run_test()
 			return ret;
 		}
 
+		/* Here we have a successful cq read */
+		ret = FI_SUCCESS;
 		if (comp.flags & FI_REMOTE_CQ_DATA) {
 			if ((comp.data & mask) == (remote_cq_data & mask)) {
 				fprintf(stdout, "remote_cq_data: success\n");
-				ret = 0;
 			} else {
 				fprintf(stdout, "error, Expected data:0x%" PRIx64
 					", Received data:0x%" PRIx64 "\n",
 					remote_cq_data, comp.data);
-				ret = -FI_EIO;
+				return -FI_EIO;
 			}
 
 			if (comp.len == size) {
 				fprintf(stdout, "fi_cq_data_entry.len verify: success\n");
-				ret = 0;
 			} else {
 				fprintf(stdout, "error, Expected len:%zu, Received len:%zu\n",
 					size, comp.len);
-				ret = -FI_EIO;
+				return -FI_EIO;
 			}
 		} else {
 			fprintf(stdout, "error, CQ data flag not set\n");
-			ret = -FI_EBADFLAGS;
+			return -FI_EBADFLAGS;
 		}
 	}