From e88bb9dd592f25c030fa6c13aa7f75c8af270b76 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Wed, 17 Jun 2020 01:42:05 -0400 Subject: [PATCH] call MPI_Finalize() so we don't have spurious memory leaks from MPI reported by valgrind --- unittest/commands/test_simple_commands.cpp | 5 ++++- unittest/force-styles/test_main.cpp | 5 ++++- unittest/formats/test_atom_styles.cpp | 5 ++++- unittest/formats/test_eim_potential_file_reader.cpp | 5 ++++- unittest/formats/test_potential_file_reader.cpp | 5 ++++- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/unittest/commands/test_simple_commands.cpp b/unittest/commands/test_simple_commands.cpp index 196a4506b1..1f5d4b5493 100644 --- a/unittest/commands/test_simple_commands.cpp +++ b/unittest/commands/test_simple_commands.cpp @@ -128,5 +128,8 @@ int main(int argc, char **argv) MPI_Init(&argc, &argv); ::testing::InitGoogleMock(&argc, argv); if ((argc > 1) && (strcmp(argv[1], "-v") == 0)) verbose = true; - return RUN_ALL_TESTS(); + + int rv = RUN_ALL_TESTS(); + MPI_Finalize(); + return rv; } diff --git a/unittest/force-styles/test_main.cpp b/unittest/force-styles/test_main.cpp index 6c4973dfe7..6ff5194076 100644 --- a/unittest/force-styles/test_main.cpp +++ b/unittest/force-styles/test_main.cpp @@ -110,5 +110,8 @@ int main(int argc, char **argv) return 1; } } - return RUN_ALL_TESTS(); + + int rv = RUN_ALL_TESTS(); + MPI_Finalize(); + return rv; } diff --git a/unittest/formats/test_atom_styles.cpp b/unittest/formats/test_atom_styles.cpp index fdfb78fa76..429d25f89f 100644 --- a/unittest/formats/test_atom_styles.cpp +++ b/unittest/formats/test_atom_styles.cpp @@ -350,5 +350,8 @@ int main(int argc, char **argv) MPI_Init(&argc, &argv); ::testing::InitGoogleMock(&argc, argv); if ((argc > 1) && (strcmp(argv[1], "-v") == 0)) verbose = true; - return RUN_ALL_TESTS(); + + int rv = RUN_ALL_TESTS(); + MPI_Finalize(); + return rv; } diff --git a/unittest/formats/test_eim_potential_file_reader.cpp b/unittest/formats/test_eim_potential_file_reader.cpp index ff09c74dc6..fce179621e 100644 --- a/unittest/formats/test_eim_potential_file_reader.cpp +++ b/unittest/formats/test_eim_potential_file_reader.cpp @@ -202,5 +202,8 @@ int main(int argc, char **argv) MPI_Init(&argc, &argv); ::testing::InitGoogleMock(&argc, argv); if ((argc > 1) && (strcmp(argv[1], "-v") == 0)) verbose = true; - return RUN_ALL_TESTS(); + + int rv = RUN_ALL_TESTS(); + MPI_Finalize(); + return rv; } diff --git a/unittest/formats/test_potential_file_reader.cpp b/unittest/formats/test_potential_file_reader.cpp index 2e289a6a1f..d168ca22c0 100644 --- a/unittest/formats/test_potential_file_reader.cpp +++ b/unittest/formats/test_potential_file_reader.cpp @@ -199,5 +199,8 @@ int main(int argc, char **argv) MPI_Init(&argc, &argv); ::testing::InitGoogleMock(&argc, argv); if ((argc > 1) && (strcmp(argv[1], "-v") == 0)) verbose = true; - return RUN_ALL_TESTS(); + + int rv = RUN_ALL_TESTS(); + MPI_Finalize(); + return rv; }