This is an archive of the discontinued LLVM Phabricator instance.

[test] Fix accidental match in parent_recurse_depth.s
ClosedPublic

Authored by thopre on Jun 4 2021, 2:00 AM.

Download Raw Diff

Details

Reviewers

gbreynoo
Higuoxing
MaskRay
shchenz
jhenderson

Commits

rGd7e0948242b8: [test] Fix accidental match in parent_recurse_depth.s

Summary

The CHECK-NOT directives in
tools/llvm-dwarfdump/X86/parent_recurse_depth.s can accidentally match
something in the path of the object file created by yaml2obj, for
example:

llvm-project/llvm/test/tools/llvm-dwarfdump/X86/parent_recurse_depth.s:13:12:
error: ONE-NOT: excluded string found in input

<stdin>:1:22: note: found here
builds/llvm-projects/mainline/release/test/tools/llvm-dwarfdump/X86/Output/parent_recurse_depth.s.tmp.o: file format elf64-x86-64

^~~~

This commit alleviate this issue by consuming the file name from the
output, forcing all the CHECK-NOT to match what comes after.

Diff Detail

Repository: rG LLVM Github Monorepo

Event Timeline

thopre created this revision.Jun 4 2021, 2:00 AM

Herald added subscribers: cmtice, pengfei. · View Herald TranscriptJun 4 2021, 2:00 AM

thopre requested review of this revision.Jun 4 2021, 2:00 AM

Herald added a project: Restricted Project. · View Herald TranscriptJun 4 2021, 2:00 AM

thopre mentioned this in D103250: [llvm-dwarfdump][test] Add missing dedicated tests for some options.Jun 4 2021, 2:00 AM

Harbormaster completed remote builds in B107625: Diff 349790.Jun 4 2021, 2:31 AM

LGTM, thanks!

This revision is now accepted and ready to land.Jun 4 2021, 3:03 AM

Closed by commit rGd7e0948242b8: [test] Fix accidental match in parent_recurse_depth.s (authored by thopre). · Explain WhyJun 4 2021, 3:23 AM

This revision was automatically updated to reflect the committed changes.

thopre added a commit: rGd7e0948242b8: [test] Fix accidental match in parent_recurse_depth.s.

Revision Contents

Path

Size

llvm/

test/

tools/

llvm-dwarfdump/

X86/

parent_recurse_depth.s

10 lines

Diff 349802

llvm/test/tools/llvm-dwarfdump/X86/parent_recurse_depth.s

	# RUN: yaml2obj %s -o %t.o			# RUN: yaml2obj %s -o %t.o
	# RUN: llvm-dwarfdump --debug-info=0x00000020 -p -parent-recurse-depth 0 %t.o \| FileCheck %s --check-prefix=ALL			# RUN: llvm-dwarfdump --debug-info=0x00000020 -p -parent-recurse-depth 0 %t.o \| FileCheck %s --check-prefixes=COMMON,ALL
	# RUN: llvm-dwarfdump --debug-info=0x00000020 -p -parent-recurse-depth 1 %t.o \| FileCheck %s --check-prefix=ONE			# RUN: llvm-dwarfdump --debug-info=0x00000020 -p -parent-recurse-depth 1 %t.o \| FileCheck %s --check-prefixes=COMMON,ONE
	# RUN: llvm-dwarfdump --debug-info=0x00000020 -p -parent-recurse-depth 2 %t.o \| FileCheck %s --check-prefix=TWO			# RUN: llvm-dwarfdump --debug-info=0x00000020 -p -parent-recurse-depth 2 %t.o \| FileCheck %s --check-prefixes=COMMON,TWO
	# RUN: llvm-dwarfdump --debug-info=0x00000020 -p -parent-recurse-depth 3 %t.o \| FileCheck %s --check-prefix=ALL			# RUN: llvm-dwarfdump --debug-info=0x00000020 -p -parent-recurse-depth 3 %t.o \| FileCheck %s --check-prefixes=COMMON,ALL

				# COMMON: .o: file format

	# ALL: by_hand			# ALL: by_hand
	# ALL: main			# ALL: main
	# ALL: test			# ALL: test
	# ALL: int			# ALL: int

	# ONE-NOT: by_hand			# ONE-NOT: by_hand
	# ONE-NOT: main			# ONE-NOT: main
	▲ Show 20 Lines • Show All 52 Lines • Show Last 20 Lines