Changeset dfed1c for test/unit_test/unit_test.cpp

Timestamp:

Nov 22, 2011, 9:22:10 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

facba0

Parents:

66f24d

Message:

Major vmg update.

git-svn-id: ​https://svn.version.fz-juelich.de/scafacos/trunk@1136 5161e1c8-67bf-11de-9fd5-51895aff932f

File:

• test/unit_test/unit_test.cpp (modified) (2 diffs)

test/unit_test/unit_test.cpp

@@ -10 +10 @@
 #endif
 
+#ifdef HAVE_MPI
+#include <mpi.h>
+#endif
+
 #include <cppunit/TestResult.h>
 #include <cppunit/TestResultCollector.h>
@@ -17 +21 @@
 #include <cppunit/CompilerOutputter.h>
 
+#include "comm/mpi/error_handler.hpp"
+
 int main(int argc, char *argv[])
 {
-        CppUnit::TestResult testresult;
 
-        CppUnit::TestResultCollector collectedresults;
-        testresult.addListener(&collectedresults);
+#ifdef HAVE_MPI
+  MPI_Errhandler mpiErrorHandler;
 
-        CppUnit::BriefTestProgressListener progress;
-        testresult.addListener(&progress);
+  MPI_Init(&argc, &argv);
 
-        CppUnit::TestRunner testrunner;
-        testrunner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
-        testrunner.run(testresult);
+  MPI_Comm_create_errhandler(VMG::MPI::ConvertToException, &mpiErrorHandler);
+  MPI_Comm_set_errhandler(MPI_COMM_WORLD, mpiErrorHandler);
+#endif
 
-        CppUnit::CompilerOutputter compileroutputter(&collectedresults, std::cerr);
-        compileroutputter.write();
-        return (collectedresults.wasSuccessful() ? 0 : 1);
+  CppUnit::TestResult testresult;
+
+  CppUnit::TestResultCollector collectedresults;
+  testresult.addListener(&collectedresults);
+
+  CppUnit::BriefTestProgressListener progress;
+  testresult.addListener(&progress);
+
+  CppUnit::TestRunner testrunner;
+  testrunner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+  testrunner.run(testresult);
+
+  CppUnit::CompilerOutputter compileroutputter(&collectedresults, std::cerr);
+  compileroutputter.write();
+
+#ifdef HAVE_MPI
+  MPI_Errhandler_free(&mpiErrorHandler);
+
+  MPI_Finalize();
+#endif
+
+  return (collectedresults.wasSuccessful() ? 0 : 1);
 }