Skip to content

Commit ec665b7

Browse files
committed
test: make testsuite compatible with clang
In modern clang versions, we run into gtest#2271. As it looks like this issue will be there for some time, we simply apply the proposed workaround.
1 parent d29830c commit ec665b7

File tree

4 files changed

+14
-4
lines changed

4 files changed

+14
-4
lines changed

test/.StaticInterfaceTests.cpp.swp

12 KB
Binary file not shown.

test/InterfaceTests.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ using namespace libmvc;
1111
template<typename SOLVER>
1212
class InterfaceTests: public ::testing::Test { };
1313

14-
typedef ::testing::Types<NuMVC, FastVC, ParallelSolverAdapter<NuMVC>, ParallelSolverAdapter<FastVC>> SolverTypes;
15-
TYPED_TEST_CASE(InterfaceTests, SolverTypes);
14+
using SolverTypes = ::testing::Types<NuMVC, FastVC, ParallelSolverAdapter<NuMVC>, ParallelSolverAdapter<FastVC>>;
15+
TYPED_TEST_SUITE(InterfaceTests, SolverTypes, );
1616

1717
extern std::string filename;
1818
extern int cover_size;

test/SolverTests.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ using namespace libmvc;
1111
template<typename SOLVER>
1212
class SolverTests : public ::testing::Test { };
1313

14-
typedef ::testing::Types<NuMVC, FastVC, ParallelSolverAdapter<NuMVC>, ParallelSolverAdapter<FastVC>> SolverTypes;
15-
TYPED_TEST_CASE(SolverTests, SolverTypes);
14+
using SolverTypes = ::testing::Types<NuMVC, FastVC, ParallelSolverAdapter<NuMVC>, ParallelSolverAdapter<FastVC>>;
15+
TYPED_TEST_SUITE(SolverTests, SolverTypes, );
1616

1717
extern std::string filename;
1818
extern int cover_size;
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
Build started at 2018-05-02T15:32:50.965794
2+
Main binary: /usr/bin/python3
3+
Python system: Linux
4+
The Meson build system
5+
Version: 0.45.1
6+
Source dir: /home/felix/repos/github-fmoessbauer/LibMVC/test
7+
Build dir: /home/felix/repos/github-fmoessbauer/LibMVC/test/build
8+
Build type: native build
9+
10+
ERROR: First statement must be a call to project

0 commit comments

Comments
 (0)