chore(fstypes): show section version in dump

mhx · Dec 19, 2024 · 9071ee5 · 9071ee5
1 parent ab21ffa
commit 9071ee5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/fstypes.cpp b/src/fstypes.cpp
@@ -82,7 +82,7 @@ std::string get_section_name(section_type type) {
 }
 
 void section_header::dump(std::ostream& os) const {
-  os << "type=" << get_default(sections, type) << ", compression="
+  os << "[V1] type=" << get_default(sections, type) << ", compression="
      << get_default(compressions, static_cast<compression_type>(compression))
      << ", length=" << length;
 }
@@ -94,7 +94,8 @@ std::string section_header::to_string() const {
 }
 
 void section_header_v2::dump(std::ostream& os) const {
-  os << "num=" << number
+  os << "[V" << static_cast<int>(major) << "." << static_cast<int>(minor)
+     << "] num=" << number
      << ", type=" << get_default(sections, static_cast<section_type>(type))
      << ", compression="
      << get_default(compressions, static_cast<compression_type>(compression))

diff --git a/test/dwarfs_test.cpp b/test/dwarfs_test.cpp
@@ -849,7 +849,8 @@ TEST_P(compression_regression, github45) {
   reader::filesystem_v2::identify(lgr, *input, mm, idss, 3);
 
   std::string line;
-  std::regex const re("^SECTION num=\\d+, type=BLOCK, compression=(\\w+).*");
+  std::regex const re(
+      "^SECTION \\[[^\\]]+\\] num=\\d+, type=BLOCK, compression=(\\w+).*");
   std::set<std::string> compressions;
   while (std::getline(idss, line)) {
     std::smatch m;