This is an archive of the discontinued LLVM Phabricator instance.

[12.0.0][llvm-symbolizer][test] Fix test broken after cherry-pick
ClosedPublic

Authored by jhenderson on Feb 23 2021, 4:39 AM.

Download Raw Diff

Details

Reviewers

tstellar
MaskRay

Commits

rG1c0a0c727eae: [12.0.0][llvm-symbolizer][test] Fix test broken after cherry-pick

Summary

See bug https://bugs.llvm.org/show_bug.cgi?id=49227. The cherry-pick 0d4f8a3f364f introduced a test failure, as the test included use of a feature that was only recently added to lit and isn't in the release branch. This patch fixes up the test to manage without this lit change.

Diff Detail

Repository: rG LLVM Github Monorepo

Event Timeline

jhenderson created this revision.Feb 23 2021, 4:39 AM

Herald added a subscriber: rupprecht. · View Herald TranscriptFeb 23 2021, 4:39 AM

jhenderson requested review of this revision.Feb 23 2021, 4:39 AM

Herald added a project: Restricted Project. · View Herald TranscriptFeb 23 2021, 4:39 AM

@tstellar, this patch passes locally for me on the release branch. Assuming you're happy with it, what is the best way to land this on the branch?

Harbormaster completed remote builds in B90374: Diff 325742.Feb 23 2021, 6:03 AM

You can go ahead and push it directly to the branch.

This revision is now accepted and ready to land.Feb 23 2021, 9:26 AM

Thanks!

I've merged this.

Thanks!

In D97272#2582261, @tstellar wrote:

You can go ahead and push it directly to the branch.

For reference, I was "out of the office" by the time you posted that.

Revision Contents

Path

Size

llvm/

test/

tools/

llvm-symbolizer/

output-style-inlined.test

8 lines

Diff 325742

llvm/test/tools/llvm-symbolizer/output-style-inlined.test

	Show All 27 Lines

	LLVM: main			LLVM: main
	GNU: inctwo			GNU: inctwo

	## Check that we are able to produce an output properly when the --no-inlines option			## Check that we are able to produce an output properly when the --no-inlines option
	## is specified, but a file doesn't exist. Check we report an error.			## is specified, but a file doesn't exist. Check we report an error.

	RUN: llvm-symbolizer --output-style=GNU --obj=%p/Inputs/not.exist 0x1 0x2 --no-inlines 2>&1 \			RUN: llvm-symbolizer --output-style=GNU --obj=%p/Inputs/not.exist 0x1 0x2 --no-inlines 2>&1 \
	RUN: \| FileCheck %s --check-prefix=NOT-EXIST-GNU -DMSG=%errc_ENOENT			RUN: \| FileCheck %s --check-prefix=NOT-EXIST-GNU
	RUN: llvm-symbolizer --output-style=LLVM --obj=%p/Inputs/not.exist 0x1 0x2 --no-inlines 2>&1 \			RUN: llvm-symbolizer --output-style=LLVM --obj=%p/Inputs/not.exist 0x1 0x2 --no-inlines 2>&1 \
	RUN: \| FileCheck %s --check-prefix=NOT-EXIST-LLVM -DMSG=%errc_ENOENT			RUN: \| FileCheck %s --check-prefix=NOT-EXIST-LLVM

	# NOT-EXIST-GNU: LLVMSymbolizer: error reading file: [[MSG]]			# NOT-EXIST-GNU: LLVMSymbolizer: error reading file: {{[Nn]}}o such file or directory
	# NOT-EXIST-GNU-NEXT: ??			# NOT-EXIST-GNU-NEXT: ??
	# NOT-EXIST-GNU-NEXT: ??:0			# NOT-EXIST-GNU-NEXT: ??:0
	# NOT-EXIST-GNU-NEXT: ??			# NOT-EXIST-GNU-NEXT: ??
	# NOT-EXIST-GNU-NEXT: ??:0			# NOT-EXIST-GNU-NEXT: ??:0

	# NOT-EXIST-LLVM: LLVMSymbolizer: error reading file: [[MSG]]			# NOT-EXIST-LLVM: LLVMSymbolizer: error reading file: {{[Nn]}}o such file or directory
	# NOT-EXIST-LLVM-NEXT: ??			# NOT-EXIST-LLVM-NEXT: ??
	# NOT-EXIST-LLVM-NEXT: ??:0:0			# NOT-EXIST-LLVM-NEXT: ??:0:0
	# NOT-EXIST-LLVM-EMPTY:			# NOT-EXIST-LLVM-EMPTY:
	# NOT-EXIST-LLVM-NEXT: ??			# NOT-EXIST-LLVM-NEXT: ??
	# NOT-EXIST-LLVM-NEXT: ??:0:0			# NOT-EXIST-LLVM-NEXT: ??:0:0