Commit ffa385d3 authored by Siva Mahadevan's avatar Siva Mahadevan Committed by Chris Lamb
Browse files

comparators/ar: use --print-armap long option with nm

parent 49b67562

diffoscope/comparators/ar.py

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ class ArContainer(LibarchiveContainer): 
class ArSymbolTableDumper(Command):

    @tool_required("nm")

    def cmdline(self):

        return ["nm", "-s", self.path]

        return ["nm", "--print-armap", self.path]





class ArFile(File):

tests/comparators/test_rlib.py

+2 −2
Original line number Diff line number Diff line
@@ -100,8 +100,8 @@ def test_num_items(differences): 
@skip_unless_tools_exist("nm")

@skip_if_binutils_does_not_support_x86()

def test_item0_armap(differences):

    assert differences[0].source1 == "nm -s {}"

    assert differences[0].source2 == "nm -s {}"

    assert differences[0].source1 == "nm --print-armap {}"

    assert differences[0].source2 == "nm --print-armap {}"

    expected_diff = get_data("rlib_armap_expected_diff")

    assert differences[0].unified_diff == expected_diff