Skip to content

Commit

Permalink
Fix bug that suppressed DWARF read tests.
Browse files Browse the repository at this point in the history 
Commit 4252dfd added code to allow the ABI write/reread and compare
phases of the tests to be skipped in the case that no ABI files are
given for comparison.

Unfortunately, the new code skipped those phases unconditionally.

This patch changes the in_abi_path and out_abi_path values used in
in_out_specs used to trigger the early termination from "" to NULL and
updates the conditional logic checking them. Several subsequent
commits which affect ABI output were missing these changes to the test
data files.

This change fixes the following list of commits.

4252dfd dwarf-reader: handle symtab.section_header.sh_entsize == 0
4457c10 dwarf-reader: handle binaries with missing symtab
34e867e dwarf-reader: remove superfluous ABG_ASSERT
2d5389f Fix size calculations for multidimensional arrays.
246ca20 corpus/writer: sort emitted translation units by path name
e8bf5b8 Bug 25989 - type_topo_comp doesn't meet irreflexive requirements

Finally, this commit also corrects some bad code formatting.

	* tests/test-read-dwarf.cc (in_out_specs): Use NULL instead of
	empty ABI paths for test25, test26 and test27. (perform):
	Check members of spec, rather than locals with same name, when
	deciding to terminate testing early; fix some code whitespace.
	* tests/data/test-read-dwarf/test14-pr18893.so.abi: Update
	multidimensional array sizes.
	* tests/data/test-read-dwarf/test17-pr19027.so.abi: Ditto.
	* tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi:
	Ditto.
	* tests/data/test-read-dwarf/test7.so.abi: Ditto.
	* tests/data/test-read-dwarf/PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi:
	Update following translation unit ordering change.
	* tests/data/test-read-dwarf/test13-pr18894.so.abi: Ditto.
	* tests/data/test-read-dwarf/test14-pr18893.so.abi: Ditto.
	* tests/data/test-read-dwarf/test15-pr18892.so.abi: Ditto.
	* tests/data/test-read-dwarf/test16-pr18904.so.abi: Ditto.
	* tests/data/test-read-dwarf/test17-pr19027.so.abi: Ditto.
	* tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so.abi:
	Ditto.
	* tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi:
	Ditto.
	* tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi:
	Ditto.
	* tests/data/test-read-dwarf/test21-pr19092.so.abi: Ditto.
	* tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi:
	Ditto.
	* tests/data/test-read-dwarf/PR25007-sdhci.ko.abi: Update
	following code changes affecting ordering of some ABI
	elements.
	* tests/data/test-read-dwarf/test16-pr18904.so.abi

Reviewed-by: Matthias Maennich <maennich@google.com>
Tested-by: Matthias Maennich <maennich@google.com>
Signed-off-by: Giuliano Procida <gprocida@google.com>
  • Loading branch information
@myxoid
myxoid committed Jun 16, 2020
1 parent 29de666 commit 15579d7
Show file tree
Hide file tree
Showing 14 changed files with 119,199 additions and 118,898 deletions.
3,442 changes: 1,728 additions & 1,714 deletions tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
View file

Large diffs are not rendered by default.

1,072 changes: 536 additions & 536 deletions tests/data/test-read-dwarf/PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi
View file

Large diffs are not rendered by default.

454 changes: 227 additions & 227 deletions tests/data/test-read-dwarf/test13-pr18894.so.abi
View file

Large diffs are not rendered by default.

10,274 changes: 5,137 additions & 5,137 deletions tests/data/test-read-dwarf/test14-pr18893.so.abi
View file

Large diffs are not rendered by default.

38,226 changes: 19,113 additions & 19,113 deletions tests/data/test-read-dwarf/test15-pr18892.so.abi
View file

Large diffs are not rendered by default.

44,259 changes: 22,146 additions & 22,113 deletions tests/data/test-read-dwarf/test16-pr18904.so.abi
View file

Large diffs are not rendered by default.

11,110 changes: 5,555 additions & 5,555 deletions tests/data/test-read-dwarf/test17-pr19027.so.abi
View file

Large diffs are not rendered by default.

42 changes: 21 additions & 21 deletions tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14578,8 +14578,17 @@


</abi-instr>
<abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_VT.cxx' language='LANG_C_plus_plus'>
<var-decl name='vtkLineIntegralConvolution2D_VT' type-id='type-id-68' mangled-name='vtkLineIntegralConvolution2D_VT' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_VT.cxx' line='9' column='1' elf-symbol-id='vtkLineIntegralConvolution2D_VT'/>
<abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_AAH.cxx' language='LANG_C_plus_plus'>
<var-decl name='vtkLineIntegralConvolution2D_AAH' type-id='type-id-68' mangled-name='vtkLineIntegralConvolution2D_AAH' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_AAH.cxx' line='9' column='1' elf-symbol-id='vtkLineIntegralConvolution2D_AAH'/>
</abi-instr>
<abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_AAV.cxx' language='LANG_C_plus_plus'>
<var-decl name='vtkLineIntegralConvolution2D_AAV' type-id='type-id-68' mangled-name='vtkLineIntegralConvolution2D_AAV' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_AAV.cxx' line='9' column='1' elf-symbol-id='vtkLineIntegralConvolution2D_AAV'/>
</abi-instr>
<abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_CE.cxx' language='LANG_C_plus_plus'>
<var-decl name='vtkLineIntegralConvolution2D_CE' type-id='type-id-68' mangled-name='vtkLineIntegralConvolution2D_CE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_CE.cxx' line='9' column='1' elf-symbol-id='vtkLineIntegralConvolution2D_CE'/>
</abi-instr>
<abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_EE.cxx' language='LANG_C_plus_plus'>
<var-decl name='vtkLineIntegralConvolution2D_EE' type-id='type-id-68' mangled-name='vtkLineIntegralConvolution2D_EE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_EE.cxx' line='9' column='1' elf-symbol-id='vtkLineIntegralConvolution2D_EE'/>
</abi-instr>
<abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_LIC0.cxx' language='LANG_C_plus_plus'>
<var-decl name='vtkLineIntegralConvolution2D_LIC0' type-id='type-id-68' mangled-name='vtkLineIntegralConvolution2D_LIC0' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_LIC0.cxx' line='9' column='1' elf-symbol-id='vtkLineIntegralConvolution2D_LIC0'/>
Expand All @@ -14590,34 +14599,25 @@
<abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_LICN.cxx' language='LANG_C_plus_plus'>
<var-decl name='vtkLineIntegralConvolution2D_LICN' type-id='type-id-68' mangled-name='vtkLineIntegralConvolution2D_LICN' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_LICN.cxx' line='9' column='1' elf-symbol-id='vtkLineIntegralConvolution2D_LICN'/>
</abi-instr>
<abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_EE.cxx' language='LANG_C_plus_plus'>
<var-decl name='vtkLineIntegralConvolution2D_EE' type-id='type-id-68' mangled-name='vtkLineIntegralConvolution2D_EE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_EE.cxx' line='9' column='1' elf-symbol-id='vtkLineIntegralConvolution2D_EE'/>
</abi-instr>
<abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_CE.cxx' language='LANG_C_plus_plus'>
<var-decl name='vtkLineIntegralConvolution2D_CE' type-id='type-id-68' mangled-name='vtkLineIntegralConvolution2D_CE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_CE.cxx' line='9' column='1' elf-symbol-id='vtkLineIntegralConvolution2D_CE'/>
</abi-instr>
<abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_AAH.cxx' language='LANG_C_plus_plus'>
<var-decl name='vtkLineIntegralConvolution2D_AAH' type-id='type-id-68' mangled-name='vtkLineIntegralConvolution2D_AAH' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_AAH.cxx' line='9' column='1' elf-symbol-id='vtkLineIntegralConvolution2D_AAH'/>
</abi-instr>
<abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_AAV.cxx' language='LANG_C_plus_plus'>
<var-decl name='vtkLineIntegralConvolution2D_AAV' type-id='type-id-68' mangled-name='vtkLineIntegralConvolution2D_AAV' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_AAV.cxx' line='9' column='1' elf-symbol-id='vtkLineIntegralConvolution2D_AAV'/>
<abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_VT.cxx' language='LANG_C_plus_plus'>
<var-decl name='vtkLineIntegralConvolution2D_VT' type-id='type-id-68' mangled-name='vtkLineIntegralConvolution2D_VT' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_VT.cxx' line='9' column='1' elf-symbol-id='vtkLineIntegralConvolution2D_VT'/>
</abi-instr>
<abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkStructuredGridLIC2D_fs.cxx' language='LANG_C_plus_plus'>
<var-decl name='vtkStructuredGridLIC2D_fs' type-id='type-id-68' mangled-name='vtkStructuredGridLIC2D_fs' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkStructuredGridLIC2D_fs.cxx' line='9' column='1' elf-symbol-id='vtkStructuredGridLIC2D_fs'/>
</abi-instr>
<abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_GeomVs.cxx' language='LANG_C_plus_plus'>
<var-decl name='vtkSurfaceLICPainter_GeomVs' type-id='type-id-68' mangled-name='vtkSurfaceLICPainter_GeomVs' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_GeomVs.cxx' line='9' column='1' elf-symbol-id='vtkSurfaceLICPainter_GeomVs'/>
<abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_CE.cxx' language='LANG_C_plus_plus'>
<var-decl name='vtkSurfaceLICPainter_CE' type-id='type-id-68' mangled-name='vtkSurfaceLICPainter_CE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_CE.cxx' line='9' column='1' elf-symbol-id='vtkSurfaceLICPainter_CE'/>
</abi-instr>
<abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_DCpy.cxx' language='LANG_C_plus_plus'>
<var-decl name='vtkSurfaceLICPainter_DCpy' type-id='type-id-68' mangled-name='vtkSurfaceLICPainter_DCpy' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_DCpy.cxx' line='9' column='1' elf-symbol-id='vtkSurfaceLICPainter_DCpy'/>
</abi-instr>
<abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_GeomFs.cxx' language='LANG_C_plus_plus'>
<var-decl name='vtkSurfaceLICPainter_GeomFs' type-id='type-id-68' mangled-name='vtkSurfaceLICPainter_GeomFs' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_GeomFs.cxx' line='9' column='1' elf-symbol-id='vtkSurfaceLICPainter_GeomFs'/>
</abi-instr>
<abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_GeomVs.cxx' language='LANG_C_plus_plus'>
<var-decl name='vtkSurfaceLICPainter_GeomVs' type-id='type-id-68' mangled-name='vtkSurfaceLICPainter_GeomVs' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_GeomVs.cxx' line='9' column='1' elf-symbol-id='vtkSurfaceLICPainter_GeomVs'/>
</abi-instr>
<abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_SC.cxx' language='LANG_C_plus_plus'>
<var-decl name='vtkSurfaceLICPainter_SC' type-id='type-id-68' mangled-name='vtkSurfaceLICPainter_SC' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_SC.cxx' line='9' column='1' elf-symbol-id='vtkSurfaceLICPainter_SC'/>
</abi-instr>
<abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_CE.cxx' language='LANG_C_plus_plus'>
<var-decl name='vtkSurfaceLICPainter_CE' type-id='type-id-68' mangled-name='vtkSurfaceLICPainter_CE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_CE.cxx' line='9' column='1' elf-symbol-id='vtkSurfaceLICPainter_CE'/>
</abi-instr>
<abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_DCpy.cxx' language='LANG_C_plus_plus'>
<var-decl name='vtkSurfaceLICPainter_DCpy' type-id='type-id-68' mangled-name='vtkSurfaceLICPainter_DCpy' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_DCpy.cxx' line='9' column='1' elf-symbol-id='vtkSurfaceLICPainter_DCpy'/>
</abi-instr>
</abi-corpus>
Loading

0 comments on commit 15579d7

Please sign in to comment.