Skip to content

Commit 8625aac

Browse files
committed
fix tests win debug
1 parent 19ce4ce commit 8625aac

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

check/TestHipo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// Example for using HiPO from its C++ interface. The program solves the Netlib
1111
// problem afiro.
1212

13-
#include <unistd.h>
13+
// #include <unistd.h>
1414

1515
#include <cmath>
1616
#include <iostream>

check/TestLpSolvers.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -509,11 +509,11 @@ TEST_CASE("solver-string", "[highs_lp_solver]") {
509509
HighsStatus::kOk);
510510
REQUIRE(h.setOptionValue(kSolverString, kSimplexString) == HighsStatus::kOk);
511511
REQUIRE(h.setOptionValue(kSolverString, kIpmString) == HighsStatus::kOk);
512-
REQUIRE(h.setOptionValue(kSolverString, kHipoString) ==
512+
513513
#ifdef HIPO
514-
HighsStatus::kOk);
514+
REQUIRE(h.setOptionValue(kSolverString, kHipoString) == HighsStatus::kOk);
515515
#else
516-
HighsStatus::kError);
516+
REQUIRE(h.setOptionValue(kSolverString, kHipoString) == HighsStatus::kError);
517517
#endif
518518
REQUIRE(h.setOptionValue(kSolverString, kIpxString) == HighsStatus::kOk);
519519
REQUIRE(h.setOptionValue(kSolverString, kPdlpString) == HighsStatus::kOk);

check/TestMipSolver.cpp

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1011,12 +1011,13 @@ TEST_CASE("mip-lp-solver-string", "[highs_test_mip_solver]") {
10111011
REQUIRE(h.setOptionValue(kMipLpSolverString, kSimplexString) ==
10121012
HighsStatus::kOk);
10131013
REQUIRE(h.setOptionValue(kMipLpSolverString, kIpmString) == HighsStatus::kOk);
1014-
REQUIRE(h.setOptionValue(kMipLpSolverString, kHipoString) ==
1014+
10151015
#ifdef HIPO
1016-
HighsStatus::kOk);
1016+
REQUIRE(h.setOptionValue(kMipLpSolverString, kHipoString) == HighsStatus::kOk);
10171017
#else
1018-
HighsStatus::kError);
1018+
REQUIRE(h.setOptionValue(kMipLpSolverString, kHipoString) == HighsStatus::kError);
10191019
#endif
1020+
10201021
REQUIRE(h.setOptionValue(kMipLpSolverString, kIpxString) == HighsStatus::kOk);
10211022
REQUIRE(h.setOptionValue(kMipLpSolverString, kPdlpString) ==
10221023
HighsStatus::kError);
@@ -1028,12 +1029,13 @@ TEST_CASE("mip-lp-solver-string", "[highs_test_mip_solver]") {
10281029
HighsStatus::kError);
10291030
REQUIRE(h.setOptionValue(kMipIpmSolverString, kIpmString) ==
10301031
HighsStatus::kOk);
1031-
REQUIRE(h.setOptionValue(kMipIpmSolverString, kHipoString) ==
1032+
10321033
#ifdef HIPO
1033-
HighsStatus::kOk);
1034+
REQUIRE(h.setOptionValue(kMipIpmSolverString, kHipoString) == HighsStatus::kOk);
10341035
#else
1035-
HighsStatus::kError);
1036+
REQUIRE(h.setOptionValue(kMipIpmSolverString, kHipoString) == HighsStatus::kError);
10361037
#endif
1038+
10371039
REQUIRE(h.setOptionValue(kMipIpmSolverString, kIpxString) ==
10381040
HighsStatus::kOk);
10391041
REQUIRE(h.setOptionValue(kMipIpmSolverString, kPdlpString) ==

0 commit comments

Comments
 (0)