[ML] Fix main() functions for test suites (#2383)

These have had a silly mistake ever since they were written. The observer was unregistered after main() returned. Clearly it didn't matter, as the program was about to exit anyway, but it's nice to tidy up the code.
elastic · Aug 3, 2022 · 5f57234 · 5f57234
1 parent c1eefad
commit 5f57234
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 10 deletions.
diff --git a/bin/controller/unittest/Main.cc b/bin/controller/unittest/Main.cc
@@ -23,6 +23,8 @@
 int main(int argc, char** argv) {
     ml::test::CTestObserver observer;
     boost::unit_test::framework::register_observer(observer);
-    return boost::unit_test::unit_test_main(&ml::test::CBoostTestXmlOutput::init, argc, argv);
+    int result{boost::unit_test::unit_test_main(&ml::test::CBoostTestXmlOutput::init,
+                                                argc, argv)};
     boost::unit_test::framework::deregister_observer(observer);
+    return result;
 }
diff --git a/bin/pytorch_inference/unittest/Main.cc b/bin/pytorch_inference/unittest/Main.cc
@@ -23,6 +23,8 @@
 int main(int argc, char** argv) {
     ml::test::CTestObserver observer;
     boost::unit_test::framework::register_observer(observer);
-    return boost::unit_test::unit_test_main(&ml::test::CBoostTestXmlOutput::init, argc, argv);
+    int result{boost::unit_test::unit_test_main(&ml::test::CBoostTestXmlOutput::init,
+                                                argc, argv)};
     boost::unit_test::framework::deregister_observer(observer);
+    return result;
 }
diff --git a/lib/api/unittest/Main.cc b/lib/api/unittest/Main.cc
@@ -23,6 +23,8 @@
 int main(int argc, char** argv) {
     ml::test::CTestObserver observer;
     boost::unit_test::framework::register_observer(observer);
-    return boost::unit_test::unit_test_main(&ml::test::CBoostTestXmlOutput::init, argc, argv);
+    int result{boost::unit_test::unit_test_main(&ml::test::CBoostTestXmlOutput::init,
+                                                argc, argv)};
     boost::unit_test::framework::deregister_observer(observer);
+    return result;
 }
diff --git a/lib/core/unittest/Main.cc b/lib/core/unittest/Main.cc
@@ -23,6 +23,8 @@
 int main(int argc, char** argv) {
     ml::test::CTestObserver observer;
     boost::unit_test::framework::register_observer(observer);
-    return boost::unit_test::unit_test_main(&ml::test::CBoostTestXmlOutput::init, argc, argv);
+    int result{boost::unit_test::unit_test_main(&ml::test::CBoostTestXmlOutput::init,
+                                                argc, argv)};
     boost::unit_test::framework::deregister_observer(observer);
+    return result;
 }
diff --git a/lib/maths/analytics/unittest/Main.cc b/lib/maths/analytics/unittest/Main.cc
@@ -23,6 +23,8 @@
 int main(int argc, char** argv) {
     ml::test::CTestObserver observer;
     boost::unit_test::framework::register_observer(observer);
-    return boost::unit_test::unit_test_main(&ml::test::CBoostTestXmlOutput::init, argc, argv);
+    int result{boost::unit_test::unit_test_main(&ml::test::CBoostTestXmlOutput::init,
+                                                argc, argv)};
     boost::unit_test::framework::deregister_observer(observer);
+    return result;
 }
diff --git a/lib/maths/common/unittest/Main.cc b/lib/maths/common/unittest/Main.cc
@@ -23,6 +23,8 @@
 int main(int argc, char** argv) {
     ml::test::CTestObserver observer;
     boost::unit_test::framework::register_observer(observer);
-    return boost::unit_test::unit_test_main(&ml::test::CBoostTestXmlOutput::init, argc, argv);
+    int result{boost::unit_test::unit_test_main(&ml::test::CBoostTestXmlOutput::init,
+                                                argc, argv)};
     boost::unit_test::framework::deregister_observer(observer);
+    return result;
 }
diff --git a/lib/maths/time_series/unittest/Main.cc b/lib/maths/time_series/unittest/Main.cc
@@ -23,6 +23,8 @@
 int main(int argc, char** argv) {
     ml::test::CTestObserver observer;
     boost::unit_test::framework::register_observer(observer);
-    return boost::unit_test::unit_test_main(&ml::test::CBoostTestXmlOutput::init, argc, argv);
+    int result{boost::unit_test::unit_test_main(&ml::test::CBoostTestXmlOutput::init,
+                                                argc, argv)};
     boost::unit_test::framework::deregister_observer(observer);
+    return result;
 }
diff --git a/lib/model/unittest/Main.cc b/lib/model/unittest/Main.cc
@@ -23,6 +23,8 @@
 int main(int argc, char** argv) {
     ml::test::CTestObserver observer;
     boost::unit_test::framework::register_observer(observer);
-    return boost::unit_test::unit_test_main(&ml::test::CBoostTestXmlOutput::init, argc, argv);
+    int result{boost::unit_test::unit_test_main(&ml::test::CBoostTestXmlOutput::init,
+                                                argc, argv)};
     boost::unit_test::framework::deregister_observer(observer);
+    return result;
 }
diff --git a/lib/seccomp/unittest/Main.cc b/lib/seccomp/unittest/Main.cc
@@ -23,6 +23,8 @@
 int main(int argc, char** argv) {
     ml::test::CTestObserver observer;
     boost::unit_test::framework::register_observer(observer);
-    return boost::unit_test::unit_test_main(&ml::test::CBoostTestXmlOutput::init, argc, argv);
+    int result{boost::unit_test::unit_test_main(&ml::test::CBoostTestXmlOutput::init,
+                                                argc, argv)};
     boost::unit_test::framework::deregister_observer(observer);
+    return result;
 }
diff --git a/lib/ver/unittest/Main.cc b/lib/ver/unittest/Main.cc
@@ -23,6 +23,8 @@
 int main(int argc, char** argv) {
     ml::test::CTestObserver observer;
     boost::unit_test::framework::register_observer(observer);
-    return boost::unit_test::unit_test_main(&ml::test::CBoostTestXmlOutput::init, argc, argv);
+    int result{boost::unit_test::unit_test_main(&ml::test::CBoostTestXmlOutput::init,
+                                                argc, argv)};
     boost::unit_test::framework::deregister_observer(observer);
+    return result;
 }