tests: adjust test_llmv_diff for llvm-13

It seems the output changes a bit. Fixes #275.

tests/comparators/test_macho.py

@@ -27,6 +27,7 @@ from diffoscope.comparators.missing_file import MissingFile
 
 from ..utils.data import load_fixture, assert_diff
 from ..utils.tools import skip_unless_tools_exist
+from .test_rlib import llvm_version
 
 
 obj1 = load_fixture("test1.macho")
@@ -93,13 +94,18 @@ def test_llvm_obj_compare_non_existing(monkeypatch, obj1):
 
 @skip_unless_tools_exist("llvm-readobj", "llvm-objdump")
 def test_llvm_diff(obj_differences):
+    if llvm_version() < "13":
+        diff_symbols = "macho_llvm_expected_diff_symbols_llvm_11"
+    else:
+        diff_symbols = "macho_llvm_expected_diff_symbols"
+
     # Headers
     assert len(obj_differences) == 8
     filenames = [
         "macho_llvm_expected_diff_strings",
         "macho_llvm_expected_diff_file_headers",
         "macho_llvm_expected_diff_needed_libs",
-        "macho_llvm_expected_diff_symbols",
+        diff_symbols,
         "macho_llvm_expected_diff_dyn_symbols",
         "macho_llvm_expected_diff_relocations",
         "macho_llvm_expected_diff_dyn_relocations",

tests/comparators/test_rlib.py

@@ -46,7 +46,7 @@ def init_tests(request, monkeypatch):
 
 
 def llvm_version():
-    return (
+    return Version(
         subprocess.check_output(["llvm-config", "--version"])
         .decode("utf-8")
         .strip()
@@ -69,7 +69,7 @@ def differences(rlib1, rlib2):
 
 @pytest.fixture
 def rlib_dis_expected_diff():
-    actual_ver = Version(llvm_version())
+    actual_ver = llvm_version()
 
     if actual_ver >= "3.8":
         diff_file = "rlib_llvm_dis_expected_diff"

tests/data/macho_llvm_expected_diff_symbols

@@ -66,7 +66,7 @@
    Symbol {
      Name: __mh_execute_header (2)
      Extern
-@@ -70,49 +11,37 @@
+@@ -70,49 +11,39 @@
      RefType: UndefinedNonLazy (0x0)
      Flags [ (0x10)
        ReferencedDynamically (0x10)
@@ -105,6 +105,7 @@
 -    Flags [ (0x200)
 -      AltEntry (0x200)
 +    Flags [ (0x100)
++      SymbolResolver (0x100)
      ]
      Value: 0x0
    }
@@ -118,6 +119,7 @@
 -    Flags [ (0x200)
 -      AltEntry (0x200)
 +    Flags [ (0x100)
++      SymbolResolver (0x100)
      ]
      Value: 0x0
    }

tests/data/macho_llvm_expected_diff_symbols_llvm_11

+@@ -1,67 +1,8 @@
+ 
+-Format: Mach-O 32-bit i386
+-Arch: i386
+-AddressSize: 32bit
+-Symbols [
+-  Symbol {
+-    Name: __mh_execute_header (2)
+-    Extern
+-    Type: Section (0xE)
+-    Section: __text (0x1)
+-    RefType: UndefinedNonLazy (0x0)
+-    Flags [ (0x10)
+-      ReferencedDynamically (0x10)
+-    ]
+-    Value: 0x1000
+-  }
+-  Symbol {
+-    Name: _i (22)
+-    Extern
+-    Type: Section (0xE)
+-    Section: __data (0x8)
+-    RefType: UndefinedNonLazy (0x0)
+-    Flags [ (0x0)
+-    ]
+-    Value: 0x200C
+-  }
+-  Symbol {
+-    Name: _main (25)
+-    Extern
+-    Type: Section (0xE)
+-    Section: __text (0x1)
+-    RefType: UndefinedNonLazy (0x0)
+-    Flags [ (0x0)
+-    ]
+-    Value: 0x1F30
+-  }
+-  Symbol {
+-    Name: _printf (31)
+-    Extern
+-    Type: Undef (0x0)
+-    Section:  (0x0)
+-    RefType: UndefinedNonLazy (0x0)
+-    Flags [ (0x200)
+-      AltEntry (0x200)
+-    ]
+-    Value: 0x0
+-  }
+-  Symbol {
+-    Name: dyld_stub_binder (39)
+-    Extern
+-    Type: Undef (0x0)
+-    Section:  (0x0)
+-    RefType: UndefinedNonLazy (0x0)
+-    Flags [ (0x200)
+-      AltEntry (0x200)
+-    ]
+-    Value: 0x0
+-  }
+-]
+-
+ Format: Mach-O 64-bit x86-64
+ Arch: x86_64
+ AddressSize: 64bit
+ Symbols [
+   Symbol {
+     Name: __mh_execute_header (2)
+     Extern
+@@ -70,49 +11,37 @@
+     RefType: UndefinedNonLazy (0x0)
+     Flags [ (0x10)
+       ReferencedDynamically (0x10)
+     ]
+     Value: 0x100000000
+   }
+   Symbol {
+-    Name: _i (22)
+-    Extern
+-    Type: Section (0xE)
+-    Section: __data (0x9)
+-    RefType: UndefinedNonLazy (0x0)
+-    Flags [ (0x0)
+-    ]
+-    Value: 0x100001018
+-  }
+-  Symbol {
+-    Name: _main (25)
++    Name: _main (22)
+     Extern
+     Type: Section (0xE)
+     Section: __text (0x1)
+     RefType: UndefinedNonLazy (0x0)
+     Flags [ (0x0)
+     ]
+-    Value: 0x100000F20
++    Value: 0x100000F40
+   }
+   Symbol {
+-    Name: _printf (31)
++    Name: _printf (28)
+     Extern
+     Type: Undef (0x0)
+     Section:  (0x0)
+     RefType: UndefinedNonLazy (0x0)
+-    Flags [ (0x200)
+-      AltEntry (0x200)
++    Flags [ (0x100)
+     ]
+     Value: 0x0
+   }
+   Symbol {
+-    Name: dyld_stub_binder (39)
++    Name: dyld_stub_binder (36)
+     Extern
+     Type: Undef (0x0)
+     Section:  (0x0)
+     RefType: UndefinedNonLazy (0x0)
+-    Flags [ (0x200)
+-      AltEntry (0x200)
++    Flags [ (0x100)
+     ]
+     Value: 0x0
+   }
+ ]