Skip to content

Commit f197158

Browse files
committed
Deactivate all tests on ordering when GKRand is not used
1 parent 176237a commit f197158

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

tests/testMetis.cpp

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ extern "C" {
99
}
1010

1111

12+
#ifdef GKRAND
13+
1214
/**
1315
* This test is a substep of the SparseLDLSolver.MatrixFactorization test
1416
* It verifies a call of a METIS function.
@@ -41,7 +43,7 @@ TEST(Metis, permutation)
4143

4244
EXPECT_EQ(perm, expectedPerm);
4345
EXPECT_EQ(invperm, expectedInvPerm);
44-
#endif
46+
#endif //METIS_VERSION_5_1_0
4547

4648
#ifdef METIS_VERSION_5_2_1
4749
//output
@@ -58,9 +60,10 @@ TEST(Metis, permutation)
5860

5961
EXPECT_EQ(perm, expectedPerm);
6062
EXPECT_EQ(invperm, expectedInvPerm);
61-
#endif
63+
#endif //METIS_VERSION_5_2_1
6264

6365
}
66+
#endif //GKRAND
6467

6568

6669
/**
@@ -132,6 +135,8 @@ TEST(SparseLDLSolver, MatrixFactorization)
132135
EXPECT_NE(invertData, nullptr);
133136

134137
EXPECT_EQ(invertData->n, 15);
138+
139+
#ifdef GKRAND
135140
#ifdef METIS_VERSION_5_1_0
136141

137142
static const sofa::type::vector<int> expected_perm_Values {
@@ -184,7 +189,7 @@ TEST(SparseLDLSolver, MatrixFactorization)
184189
static const sofa::type::vector<int> expected_LT_colptr_Values { 0, 0, 0, 0, 0, 0, 1, 3, 3, 3, 3, 4, 4, 5, 7, 11 };
185190
EXPECT_EQ(invertData->LT_colptr, expected_LT_colptr_Values);
186191

187-
#endif
192+
#endif //METIS_VERSION_5_1_0
188193

189194
#ifdef METIS_VERSION_5_2_1
190195

@@ -240,7 +245,8 @@ TEST(SparseLDLSolver, MatrixFactorization)
240245

241246
static const sofa::type::vector<int> expected_LT_colptr_Values { 0, 0, 0, 0, 0, 0, 1, 3, 3, 3, 3, 4, 5, 6, 8, 11 };
242247
EXPECT_EQ(invertData->LT_colptr, expected_LT_colptr_Values);
243-
#endif
248+
#endif //METIS_VERSION_5_2_1
249+
#endif //GKRAND
244250

245251
sofa::linearalgebra::FullVector<SReal> rightHandSide(15);
246252
rightHandSide[0] = 1.0;

0 commit comments

Comments
 (0)