Domain generation: Report the number of error that occurred

If error occurred during parsing, they were only logged, not reported
in the exit code.

Report the number of parsing errors with the program exit code.

Signed-off-by: Kevin Rocard <[email protected]>

Author: krocard

test/xml-generator/test.py

@@ -58,9 +58,10 @@
                                tofile="-",
                                lineterm="")
 diffs = list(unified)
-if not diffs:
-    sys.exit(0)
-else:
+if diffs:
     for d in diffs:
         print(d)
     sys.exit(1)
+if process.wait() != 1:
+    print("Error: Expected 1 error, found {}".format(process.returncode))
+    sys.exit(1)

test/xml-generator/testVector/first.pfw

@@ -31,3 +31,5 @@ domainGroup: EddGroup
 			component: /Test/test/block/1
 				q2.5 = 0
 				string = some other string
+	# Should trigger a non fatal error
+	domain: First

tools/xmlGenerator/domainGenerator.py

@@ -42,7 +42,8 @@
 
 def parseArgs():
     argparser = argparse.ArgumentParser(description="Parameter-Framework XML \
-        Settings file generator")
+        Settings file generator.\n\
+        Exit with the number of (recoverable or not) error that occured.")
     argparser.add_argument('--toplevel-config',
             help="Top-level parameter-framework configuration file. Mandatory.",
             metavar="TOPLEVEL_CONFIG_FILE",
@@ -183,6 +184,7 @@ def main():
     # EDD files (aka ".pfw" files)
     #
     parsed_edds = parseEdd(args.edd_files, args.verbose)
+    error_nb = 0
 
     # We need to modify the toplevel configuration file to account for differences
     # between development setup and target (installation) setup, in particular, the
@@ -218,7 +220,8 @@ def main():
     connector.stdin.close()
     connector.wait()
     fake_toplevel_config.delete()
+    return connector.return_code
 
 # If this file is directly executed
 if __name__ == "__main__":
-    main()
+    exit(main())

tools/xmlGenerator/domainGeneratorConnector.cpp

@@ -215,9 +215,21 @@ static const char *usage =
 
 All arguments are mandatory. If no validation is required,
 the path to the schemas can be an empty string.
+
+Exit with the number of (recoverable or not error) that occured.
+
 This program is not intended to be used standalone but rather called through
 domainGenerator.py)";
 
+/** On linux at least, a program can not exit with a value greater than 255.
+ * @return min(code, 255);
+ */
+template <class T>
+static inline int normalizeExitCode(T code)
+{
+    return int(std::min<T>(code, std::numeric_limits<uint8_t>::max()));
+}
+
 int main(int argc, char *argv[])
 {
     using std::endl;
@@ -246,8 +258,8 @@ int main(int argc, char *argv[])
         // TODO: add a check for conflicting elements
         xmlGenerator.exportDomains(std::cout);
 
-        return int(std::min<decltype(errorNb)>(errorNb, std::numeric_limits<uint8_t>::max()));
-    } catch (runtime_error e) {
+        return normalizeExitCode(errorNb);
+    } catch (std::exception &e) {
         std::cerr << e.what() << std::endl;
         return 1;
     }