From 064e1abd5b3cfc8c5803b5f727aaaeaa7c6c20e0 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Thu, 29 Dec 2022 22:22:45 -0500 Subject: [PATCH] Small tweaks to make Lepton test compile/link with MSVC --- unittest/utils/CMakeLists.txt | 6 +----- unittest/utils/test_lepton.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/unittest/utils/CMakeLists.txt b/unittest/utils/CMakeLists.txt index 5384bae6ec..a6d5545873 100644 --- a/unittest/utils/CMakeLists.txt +++ b/unittest/utils/CMakeLists.txt @@ -20,12 +20,8 @@ target_link_libraries(test_platform PRIVATE lammps GTest::GMockMain) add_test(NAME Platform COMMAND test_platform) if(PKG_LEPTON) - get_target_property(LEPTON_DEF lepton COMPILE_DEFINITIONS) - get_target_property(LEPTON_INC lepton INCLUDE_DIRECTORIES) add_executable(test_lepton test_lepton.cpp) - target_link_libraries(test_lepton PRIVATE lammps GTest::GMockMain) - target_compile_definitions(test_lepton PRIVATE ${LEPTON_DEF}) - target_include_directories(test_lepton PRIVATE ${LEPTON_INC}) + target_link_libraries(test_lepton PRIVATE lepton lammps GTest::GMockMain) add_test(NAME Lepton COMMAND test_lepton) endif() diff --git a/unittest/utils/test_lepton.cpp b/unittest/utils/test_lepton.cpp index 5f3de06aba..91532b385a 100644 --- a/unittest/utils/test_lepton.cpp +++ b/unittest/utils/test_lepton.cpp @@ -39,8 +39,10 @@ protected: testbinary = "LeptonUtilsTest"; args = {"-log", "none", "-echo", "screen", "-nocite", "-v", "num", "1"}; LAMMPSTest::SetUp(); + BEGIN_HIDE_OUTPUT(); command("region box block 0 1 0 1 0 1"); command("create_box 1 box"); + END_HIDE_OUTPUT(); variable = lmp->input->variable; } }; @@ -68,7 +70,7 @@ TEST_F(LeptonUtilsTest, substitute) ASSERT_THAT(LeptonUtils::substitute("v_num", lmp), StrEq("1")); ASSERT_THAT(LeptonUtils::substitute("eps*v_val1*k", lmp), StrEq("eps*100.0*k")); ASSERT_THAT(LeptonUtils::substitute("(2.5/v_pre)", lmp), StrEq("(2.5/0)")); - lmp->update->reset_timestep(100, false); + lmp->update->reset_timestep(100LL, false); ASSERT_THAT(LeptonUtils::substitute("(2.5/v_pre)", lmp), StrEq("(2.5/0.1)")); if (LAMMPS_NS::Info::has_exceptions()) { @@ -240,7 +242,7 @@ void verifyInvalidExpression(const std::string &expression) if (verbose) std::cout << "Checking invalid expression: " << expression << "\n"; try { Lepton::Parser::parse(expression); - } catch (const std::exception &ex) { + } catch (const std::exception &) { return; } throw std::exception();