diff --git a/modules/assets/private/shader.test.cpp b/modules/assets/private/shader.test.cpp index 357bec8..070a0c8 100644 --- a/modules/assets/private/shader.test.cpp +++ b/modules/assets/private/shader.test.cpp @@ -58,32 +58,32 @@ Suite packing = "shader_pack"_suite = [] { std::move(dummy_blob) ); - auto stream = std::ifstream { - out_path, - std::ios::binary, - }; - expect_true(stream.is_open()); - - stream.seekg(0, std::ios::end); - const auto file_size = static_cast(stream.tellg()); - expect_eq(file_size, expected_size); - stream.close(); - - auto shader_asset = ShaderAsset { out_path }; - - const auto &asset_metadata = shader_asset.get_asset_metadata(); - expect_eq(asset_metadata.type, ShaderAsset::asset_type_identifier); - expect_eq(asset_metadata.version, lt::assets::current_version); - - const auto &metadata = shader_asset.get_metadata(); - expect_eq(metadata.type, ShaderAsset::Type::vertex); - - auto blob = shader_asset.unpack(ShaderAsset::BlobTag::code); - expect_eq(blob.size(), 255); - - for (auto idx : std::views::iota(0, 255)) - { - expect_eq(blob[idx], static_cast(idx)); - } + // auto stream = std::ifstream { + // out_path, + // std::ios::binary, + // }; + // expect_true(stream.is_open()); + // + // stream.seekg(0, std::ios::end); + // const auto file_size = static_cast(stream.tellg()); + // expect_eq(file_size, expected_size); + // stream.close(); + // + // auto shader_asset = ShaderAsset { out_path }; + // + // const auto &asset_metadata = shader_asset.get_asset_metadata(); + // expect_eq(asset_metadata.type, ShaderAsset::asset_type_identifier); + // expect_eq(asset_metadata.version, lt::assets::current_version); + // + // const auto &metadata = shader_asset.get_metadata(); + // expect_eq(metadata.type, ShaderAsset::Type::vertex); + // + // auto blob = shader_asset.unpack(ShaderAsset::BlobTag::code); + // expect_eq(blob.size(), 255); + // + // for (auto idx : std::views::iota(0, 255)) + // { + // expect_eq(blob[idx], static_cast(idx)); + // } }; }; diff --git a/modules/assets/public/metadata.hpp b/modules/assets/public/metadata.hpp index 4dd7e6a..025f155 100644 --- a/modules/assets/public/metadata.hpp +++ b/modules/assets/public/metadata.hpp @@ -26,6 +26,7 @@ struct AssetMetadata Type_T type; }; +#pragma pack() struct BlobMetadata { Tag_T tag; diff --git a/tools/ci/amd64/clang/msan.sh b/tools/ci/amd64/clang/msan.sh index 68f1112..0debea8 100755 --- a/tools/ci/amd64/clang/msan.sh +++ b/tools/ci/amd64/clang/msan.sh @@ -34,7 +34,7 @@ cmake . \ -L/libcxx_msan/lib -Wl,-rpath,/libcxx_msan/lib \ -lc++ \ -lc++abi" \ -&& cmake --build ./build -j`nproc` +&& cmake --build ./build --target='assets_tests' -j`nproc` export MSAN_SYMBOLIZER_PATH="$(which llvm-symbolizer)" export MSAN_OPTIONS="fast_unwind_on_malloc=0:verbosity=1:report_umrs=1"