Skip to content

Commit 760d2d3

Browse files
kmichaelkallnes
andauthored
Extract main() from example projects (#149)
Co-authored-by: Nesterov Alexander <[email protected]>
1 parent 4cbd044 commit 760d2d3

File tree

16 files changed

+41
-64
lines changed

16 files changed

+41
-64
lines changed

tasks/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ foreach(TASK_TYPE ${LIST_OF_TASKS})
7070
set_target_properties(${exec_func_lib} PROPERTIES LINKER_LANGUAGE CXX)
7171

7272
if (USE_FUNC_TESTS)
73-
add_executable(${exec_func_tests} ${FUNC_TESTS_SOURCE_FILES})
73+
add_executable(${exec_func_tests} ${FUNC_TESTS_SOURCE_FILES} "${PATH_TO_TASK}/runner.cpp")
7474
list(APPEND LIST_OF_EXEC_TESTS ${exec_func_tests})
7575
endif (USE_FUNC_TESTS)
7676
if (USE_PERF_TESTS)
77-
add_executable(${exec_perf_tests} ${PERF_TESTS_SOURCE_FILES})
77+
add_executable(${exec_perf_tests} ${PERF_TESTS_SOURCE_FILES} "${PATH_TO_TASK}/runner.cpp")
7878
list(APPEND LIST_OF_EXEC_TESTS ${exec_perf_tests})
7979
endif (USE_PERF_TESTS)
8080

tasks/mpi/example/func_tests/main.cpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -238,14 +238,3 @@ TEST(Parallel_Operations_MPI, Test_Max_2) {
238238
ASSERT_EQ(reference_max[0], global_max[0]);
239239
}
240240
}
241-
242-
int main(int argc, char** argv) {
243-
boost::mpi::environment env(argc, argv);
244-
boost::mpi::communicator world;
245-
::testing::InitGoogleTest(&argc, argv);
246-
::testing::TestEventListeners& listeners = ::testing::UnitTest::GetInstance()->listeners();
247-
if (world.rank() != 0) {
248-
delete listeners.Release(listeners.default_result_printer());
249-
}
250-
return RUN_ALL_TESTS();
251-
}

tasks/mpi/example/perf_tests/main.cpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,3 @@ TEST(mpi_example_perf_test, test_task_run) {
8585
ASSERT_EQ(count_size_vector, global_sum[0]);
8686
}
8787
}
88-
89-
int main(int argc, char** argv) {
90-
boost::mpi::environment env(argc, argv);
91-
boost::mpi::communicator world;
92-
::testing::InitGoogleTest(&argc, argv);
93-
::testing::TestEventListeners& listeners = ::testing::UnitTest::GetInstance()->listeners();
94-
if (world.rank() != 0) {
95-
delete listeners.Release(listeners.default_result_printer());
96-
}
97-
return RUN_ALL_TESTS();
98-
}

tasks/mpi/runner.cpp

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#include <gtest/gtest.h>
2+
3+
#include <boost/mpi/communicator.hpp>
4+
#include <boost/mpi/environment.hpp>
5+
6+
int main(int argc, char** argv) {
7+
boost::mpi::environment env(argc, argv);
8+
boost::mpi::communicator world;
9+
::testing::InitGoogleTest(&argc, argv);
10+
::testing::TestEventListeners& listeners = ::testing::UnitTest::GetInstance()->listeners();
11+
if (world.rank() != 0) {
12+
delete listeners.Release(listeners.default_result_printer());
13+
}
14+
return RUN_ALL_TESTS();
15+
}

tasks/omp/example/func_tests/main.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,3 @@ TEST(Parallel_Operations_OpenMP, Test_Mult_2) {
207207
testOmpTaskParallel.post_processing();
208208
ASSERT_EQ(ref_res[0], par_res[0]);
209209
}
210-
211-
int main(int argc, char **argv) {
212-
::testing::InitGoogleTest(&argc, argv);
213-
return RUN_ALL_TESTS();
214-
}

tasks/omp/example/perf_tests/main.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,3 @@ TEST(openmp_example_perf_test, test_task_run) {
6969
ppc::core::Perf::print_perf_statistic(perfResults);
7070
ASSERT_EQ(count + 1, out[0]);
7171
}
72-
73-
int main(int argc, char **argv) {
74-
testing::InitGoogleTest(&argc, argv);
75-
return RUN_ALL_TESTS();
76-
}

tasks/omp/runner.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#include <gtest/gtest.h>
2+
3+
int main(int argc, char **argv) {
4+
::testing::InitGoogleTest(&argc, argv);
5+
return RUN_ALL_TESTS();
6+
}

tasks/seq/example/func_tests/main.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,3 @@ TEST(Sequential, Test_Sum_100) {
118118
testTaskSequential.post_processing();
119119
ASSERT_EQ(count, out[0]);
120120
}
121-
122-
int main(int argc, char **argv) {
123-
testing::InitGoogleTest(&argc, argv);
124-
return RUN_ALL_TESTS();
125-
}

tasks/seq/example/perf_tests/main.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,3 @@ TEST(sequential_example_perf_test, test_task_run) {
7878
ppc::core::Perf::print_perf_statistic(perfResults);
7979
ASSERT_EQ(count, out[0]);
8080
}
81-
82-
int main(int argc, char **argv) {
83-
testing::InitGoogleTest(&argc, argv);
84-
return RUN_ALL_TESTS();
85-
}

tasks/seq/runner.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#include <gtest/gtest.h>
2+
3+
int main(int argc, char **argv) {
4+
::testing::InitGoogleTest(&argc, argv);
5+
return RUN_ALL_TESTS();
6+
}

tasks/stl/example/func_tests/main.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,3 @@ TEST(Parallel_Operations_STL_Threads, Test_Diff_2) {
212212
TestSTLTaskParallel.post_processing();
213213
ASSERT_EQ(ref_res[0], par_res[0]);
214214
}
215-
216-
int main(int argc, char **argv) {
217-
::testing::InitGoogleTest(&argc, argv);
218-
return RUN_ALL_TESTS();
219-
}

tasks/stl/example/perf_tests/main.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,3 @@ TEST(stl_example_perf_test, test_task_run) {
7878
ppc::core::Perf::print_perf_statistic(perfResults);
7979
ASSERT_EQ(count, out[0]);
8080
}
81-
82-
int main(int argc, char **argv) {
83-
testing::InitGoogleTest(&argc, argv);
84-
return RUN_ALL_TESTS();
85-
}

tasks/stl/runner.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#include <gtest/gtest.h>
2+
3+
int main(int argc, char **argv) {
4+
::testing::InitGoogleTest(&argc, argv);
5+
return RUN_ALL_TESTS();
6+
}

tasks/tbb/example/func_tests/main.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,3 @@ TEST(Parallel_Operations_TBB, Test_Mult_2) {
206206
testTbbTaskParallel.post_processing();
207207
ASSERT_EQ(ref_res[0], par_res[0]);
208208
}
209-
210-
int main(int argc, char **argv) {
211-
::testing::InitGoogleTest(&argc, argv);
212-
return RUN_ALL_TESTS();
213-
}

tasks/tbb/example/perf_tests/main.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,3 @@ TEST(tbb_example_perf_test, test_task_run) {
7171
ppc::core::Perf::print_perf_statistic(perfResults);
7272
ASSERT_EQ(count + 1, out[0]);
7373
}
74-
75-
int main(int argc, char **argv) {
76-
testing::InitGoogleTest(&argc, argv);
77-
return RUN_ALL_TESTS();
78-
}

tasks/tbb/runner.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#include <gtest/gtest.h>
2+
3+
int main(int argc, char **argv) {
4+
::testing::InitGoogleTest(&argc, argv);
5+
return RUN_ALL_TESTS();
6+
}

0 commit comments

Comments
 (0)