include overall state in exit code

src/lib/ebus/test/test_data.cpp

@@ -22,22 +22,27 @@
 
 using namespace std;
 
+static bool error = false;
+
 void verify(bool expectFailMatch, string type, string input,
 		bool match, string expectStr, string gotStr)
 {
 	match = match && expectStr == gotStr;
 	if (expectFailMatch) {
-		if (match)
+		if (match) {
 			cout << "  failed " << type << " match >" << input
 			        << "< error: unexpectedly succeeded" << endl;
-		else
+			error = true;
+		} else {
 			cout << "  failed " << type << " match >" << input << "< OK" << endl;
-	}
-	else if (match)
+		}
+	} else if (match) {
 		cout << "  " << type << " match >" << input << "< OK" << endl;
-	else
+	} else {
 		cout << "  " << type << " match >" << input << "< error: got >"
 		        << gotStr << "<, expected >" << expectStr << "<" << endl;
+			error = true;
+	}
 }
 
 int main()
@@ -386,12 +391,14 @@ int main()
 		result_t result = mstr.parseHex(check[2]);
 		if (result != RESULT_OK) {
 			cout << "\"" << check[0] << "\": parse \"" << check[2] << "\" error: " << getResultCode(result) << endl;
+			error = true;
 			continue;
 		}
 		SymbolString sstr(false);
 		result = sstr.parseHex(check[3]);
 		if (result != RESULT_OK) {
 			cout << "\"" << check[0] << "\": parse \"" << check[3] << "\" error: " << getResultCode(result) << endl;
+			error = true;
 			continue;
 		}
 		string flags = check[4];
@@ -418,22 +425,27 @@ int main()
 		vector<string>::iterator it = entries.begin();
 		result = DataField::create(it, entries.end(), templates, fields, isSet, isTemplate, !isTemplate && (mstr[1]==BROADCAST || isMaster(mstr[1])));
 		if (failedCreate) {
-			if (result == RESULT_OK)
+			if (result == RESULT_OK) {
 				cout << "\"" << check[0] << "\": failed create error: unexpectedly succeeded" << endl;
-			else
+				error = true;
+			} else {
 				cout << "\"" << check[0] << "\": failed create OK" << endl;
+			}
 			continue;
 		}
 		if (result != RESULT_OK) {
 			cout << "\"" << check[0] << "\": create error: " << getResultCode(result) << endl;
+			error = true;
 			continue;
 		}
 		if (fields == NULL) {
 			cout << "\"" << check[0] << "\": create error: NULL" << endl;
+			error = true;
 			continue;
 		}
 		if (it != entries.end()) {
 			cout << "\"" << check[0] << "\": create error: trailing input" << endl;
+			error = true;
 			continue;
 		}
 		cout << "\"" << check[0] << "\": create OK" << endl;
@@ -443,9 +455,10 @@ int main()
 			if (result == RESULT_OK) {
 				fields = NULL;
 				cout << "  store template OK" << endl;
-			}
-			else
+			} else {
 				cout << "  store template error: " << getResultCode(result) << endl;
+				error = true;
+			}
 			continue;
 		}
 
@@ -454,26 +467,31 @@ int main()
 		result = writeMstr.parseHex(mstr.getDataStr(true, false).substr(0, 10));
 		if (result != RESULT_OK) {
 			cout << "  parse \"" << mstr.getDataStr(true, false).substr(0, 10) << "\" error: " << getResultCode(result) << endl;
+			error = true;
 		}
 		SymbolString writeSstr(false);
 		result = writeSstr.parseHex(sstr.getDataStr(true, false).substr(0, 2));
 		if (result != RESULT_OK) {
 			cout << "  parse \"" << sstr.getDataStr(true, false).substr(0, 2) << "\" error: " << getResultCode(result) << endl;
+			error = true;
 		}
 		result = fields->read(pt_masterData, mstr, 0, output, (verbose?OF_VERBOSE:0)|(numeric?OF_NUMERIC:0)|(json?OF_JSON:0), -1, false);
 		if (result >= RESULT_OK) {
 			result = fields->read(pt_slaveData, sstr, 0, output, (verbose?OF_VERBOSE:0)|(numeric?OF_NUMERIC:0)|(json?OF_JSON:0), -1, !output.str().empty());
 		}
 		if (failedRead)
-			if (result >= RESULT_OK)
+			if (result >= RESULT_OK) {
 				cout << "  failed read " << fields->getName() << " >" << check[2] << " " << check[3]
 				     << "< error: unexpectedly succeeded" << endl;
-			else
+				error = true;
+			} else {
 				cout << "  failed read " << fields->getName() << " >" << check[2] << " " << check[3]
 				     << "< OK" << endl;
+			}
 		else if (result < RESULT_OK) {
 			cout << "  read " << fields->getName() << " >" << check[2] << " " << check[3]
 			     << "< error: " << getResultCode(result) << endl;
+			error = true;
 		}
 		else {
 			bool match = strcasecmp(output.str().c_str(), expectStr.c_str()) == 0;
@@ -486,18 +504,20 @@ int main()
 			if (result >= RESULT_OK)
 				result = fields->write(input, pt_slaveData, writeSstr, 0);
 			if (failedWrite) {
-				if (result >= RESULT_OK)
+				if (result >= RESULT_OK) {
 					cout << "  failed write " << fields->getName() << " >"
 					        << expectStr << "< error: unexpectedly succeeded" << endl;
-				else
+					error = true;
+				} else {
 					cout << "  failed write " << fields->getName() << " >"
 					        << expectStr << "< OK" << endl;
+				}
 			}
 			else if (result < RESULT_OK) {
 				cout << "  write " << fields->getName() << " >" << expectStr
 				        << "< error: " << getResultCode(result) << endl;
-			}
-			else {
+				error = true;
+			} else {
 				bool match = mstr == writeMstr && sstr == writeSstr;
 				verify(failedWriteMatch, "write", expectStr, match, mstr.getDataStr(true, false) + " " + sstr.getDataStr(true, false), writeMstr.getDataStr(true, false) + " " + writeSstr.getDataStr(true, false));
 			}
@@ -508,6 +528,5 @@ int main()
 
 	delete templates;
 
-	return 0;
-
+	return error ? 1 : 0;
 }