Correctly return the exit code when the unwrapped unit test failed

STEllAR-GROUP · Jul 27, 2017 · 5c208ae · 5c208ae
1 parent 6bd34c5
commit 5c208ae
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/tests/unit/util/unwrapped.cpp b/tests/unit/util/unwrapped.cpp
@@ -287,9 +287,7 @@ int hpx_main(
         }
     }
 
-    finalize();
-
-    return report_errors();
+    return finalize();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -307,6 +305,11 @@ int main(
     };
 
     // Initialize and run HPX
-    return hpx::init(cmdline, argc, argv, cfg);
+    if (int result = init(cmdline, argc, argv, cfg))
+    {
+        return result;
+    }
+    // Report errors after HPX was finished
+    return report_errors();
 }