disable XPress tests if the license is not correctly installed

google · Jan 29, 2025 · bfb987f · bfb987f
1 parent 780dc3d
commit bfb987f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/ortools/math_opt/solvers/CMakeLists.txt b/ortools/math_opt/solvers/CMakeLists.txt
@@ -246,8 +246,7 @@ if(USE_XPRESS)
           SOURCES
           "xpress_solver_test.cc"
           LINK_LIBRARIES
-          GTest::gmock
-          GTest::gmock_main
+          GTest::gtest
           absl::status
           ortools::math_opt_matchers
           "$<LINK_LIBRARY:WHOLE_ARCHIVE,ortools::math_opt_callback_tests>"

diff --git a/ortools/math_opt/solvers/xpress_solver_test.cc b/ortools/math_opt/solvers/xpress_solver_test.cc
@@ -32,6 +32,7 @@
 #include "ortools/math_opt/solver_tests/qp_tests.h"
 #include "ortools/math_opt/solver_tests/second_order_cone_tests.h"
 #include "ortools/math_opt/solver_tests/status_tests.h"
+#include "ortools/xpress/environment.h"
 
 namespace operations_research {
 namespace math_opt {
@@ -243,4 +244,15 @@ INSTANTIATE_TEST_SUITE_P(XpressStatusTest, StatusTest,
 
 }  // namespace
 }  // namespace math_opt
-}  // namespace operations_research
+}  // namespace operations_research
+
+GTEST_API_ int main(int argc, char **argv) {
+  printf("Running main() from %s\n", __FILE__);
+  testing::InitGoogleTest(&argc, argv);
+  if (operations_research::XpressIsCorrectlyInstalled()) {
+  return RUN_ALL_TESTS();
+  } else {
+    LOG(INFO) << "XPress MP is not correctly installed, skipping";
+    return EXIT_SUCCESS;
+  }
+}