diff --git a/assets/dynamic/index.yaml b/assets/dynamic/index.yaml index 608e9ad..93246db 100644 --- a/assets/dynamic/index.yaml +++ b/assets/dynamic/index.yaml @@ -1,4 +1,4 @@ -#eos: -# helm: "eos/helm_table.dat" +eos: + helm: "eos/helm_table.dat" mesh: polySphere: "mesh/core_midres.msh" diff --git a/build-config/yaml-cpp/meson.build b/build-config/yaml-cpp/meson.build index 8a81a82..72f76c0 100644 --- a/build-config/yaml-cpp/meson.build +++ b/build-config/yaml-cpp/meson.build @@ -2,7 +2,8 @@ yaml_cpp_cmake_options = cmake.subproject_options() yaml_cpp_cmake_options.add_cmake_defines({ 'CMAKE_POLICY_VERSION_MINIMUM': '3.5', 'BUILD_SHARED_LIBS': 'ON', - 'CMAKE_SKIP_INSTALL_RULES': 'ON' + 'CMAKE_SKIP_INSTALL_RULES': 'ON', + 'YAML_CPP_BUILD_TESTS': 'OFF' }) yaml_cpp_sp = cmake.subproject( 'yaml-cpp', diff --git a/tests/network/approx8Test.cpp b/tests/network/approx8Test.cpp index 7bddef3..2bfe7fa 100644 --- a/tests/network/approx8Test.cpp +++ b/tests/network/approx8Test.cpp @@ -30,14 +30,14 @@ TEST_F(approx8Test, setStiff) { TEST_F(approx8Test, evaluate) { serif::network::approx8::Approx8Network network; serif::network::NetIn netIn; - + std::vector comp = {0.708, 2.94e-5, 0.276, 0.003, 0.0011, 9.62e-3, 1.62e-3, 5.16e-4}; netIn.composition = comp; netIn.temperature = 1e7; netIn.density = 1e2; netIn.energy = 0.0; - + netIn.tmax = 3.15e17; netIn.dt0 = 1e12; diff --git a/tests/network/meson.build b/tests/network/meson.build index 5e316fd..7b84063 100644 --- a/tests/network/meson.build +++ b/tests/network/meson.build @@ -11,7 +11,7 @@ foreach test_file : test_sources test_exe = executable( exe_name, test_file, - dependencies: [gtest_dep, network_dep, gtest_main], + dependencies: [gtest_dep, gtest_main, network_dep], include_directories: include_directories('../../src/network/public'), link_with: libnetwork, # Link the dobj library install_rpath: '@loader_path/../../src' # Ensure runtime library path resolves correctly diff --git a/tests/resource/resourceManagerTest.cpp b/tests/resource/resourceManagerTest.cpp index 09ea205..5e0f0b0 100644 --- a/tests/resource/resourceManagerTest.cpp +++ b/tests/resource/resourceManagerTest.cpp @@ -36,7 +36,7 @@ TEST_F(resourceManagerTest, getAvaliableResources) { serif::config::Config::getInstance().loadConfig(TEST_CONFIG); serif::resource::ResourceManager& rm = serif::resource::ResourceManager::getInstance(); std::vector resources = rm.getAvailableResources(); - std::set expected = {"eos:helm", "mesh:sphere"}; + std::set expected = {"eos:helm", "mesh:polySphere"}; std::set actual(resources.begin(), resources.end()); EXPECT_EQ(expected, actual); }