This is an archive of the discontinued LLVM Phabricator instance.

[lld] Remove fragile regex from test
ClosedPublic

Authored by garious on Jan 12 2015, 2:50 PM.

Download Raw Diff

Details

Reviewers

ruiu
shankarke

Commits

rG5a60ed77081c: Remove fragile regex from test
rLLD225739: Remove fragile regex from test
rL225739: Remove fragile regex from test

Summary

These tests were checking for absolute paths and could fail if it included any valid path character that was not included in that regex. This patch avoids the issue by removing the path checks.

Diff Detail

Repository: rL LLVM

Event Timeline

garious updated this revision to Diff 18048.Jan 12 2015, 2:50 PM

garious retitled this revision from to [lld] Remove fragile regex from test.

garious updated this object.

garious edited the test plan for this revision. (Show Details)

garious added reviewers: ruiu, shankarke.

garious set the repository for this revision to rL LLVM.

garious added a project: lld.

garious added a subscriber: Unknown Object (MLST).

ruiu added inline comments.Jan 12 2015, 2:56 PM

test/elf/dynamic-undef.test
30	I don't fully understand why now you need to split this into two lines. If "Undefined symbol" is not on the same line as "shared.so-x86-64: puts", why the previous test succeeded?

garious added inline comments.Jan 12 2015, 3:24 PM

test/elf/dynamic-undef.test
30	I suspect FileCheck looks for "no more than one newline". How about {{.+[\\/]}} instead?

ruiu added inline comments.Jan 12 2015, 3:34 PM

test/elf/dynamic-undef.test
30	Maybe EXEC: Undefined symbol: {{.*}}/shared.so-x86-64: puts is enough?

Attempt 2: Use a regex that accepts any set of characters that ends in a [back]slash.

garious added inline comments.Jan 12 2015, 3:39 PM

test/elf/dynamic-undef.test
30	Would that work if cross-compiling on Windows?

Closed by commit rL225739: Remove fragile regex from test (authored by garious). · Explain WhyJan 12 2015, 4:13 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents

Path

Size

test/

elf/

dynamic-undef.test

10 lines

filenotfound.test

3 lines

Diff 18048

test/elf/dynamic-undef.test

Context not available.
	RUN: --use-shlib-undefines --no-allow-shlib-undefined 2> %t2	RUN: --use-shlib-undefines --no-allow-shlib-undefined 2> %t2
	RUN: llvm-readobj -symbols %t.useundefines \| FileCheck -check-prefix=SHLIB-UNDEF-SYMBOLS %s	RUN: llvm-readobj -symbols %t.useundefines \| FileCheck -check-prefix=SHLIB-UNDEF-SYMBOLS %s

	EXEC: Undefined symbol: {{[+-_A-Za-z0-9.\\/:]+}}shared.so-x86-64: puts	EXEC: Undefined symbol:
	SHLIB: Undefined symbol: {{[+-_A-Za-z0-9.\\/:]+}}shared.so-x86-64: puts	EXEC-NEXT: shared.so-x86-64: puts
		ruiuUnsubmitted Not Done Reply Inline Actions I don't fully understand why now you need to split this into two lines. If "Undefined symbol" is not on the same line as "shared.so-x86-64: puts", why the previous test succeeded? ruiu: I don't fully understand why now you need to split this into two lines. If "Undefined symbol"…
		gariousAuthorUnsubmitted Not Done Reply Inline Actions I suspect FileCheck looks for "no more than one newline". How about {{.+[\\/]}} instead? garious: I suspect FileCheck looks for "no more than one newline". How about {{.+[\\/]}} instead?
		ruiuUnsubmitted Not Done Reply Inline Actions Maybe EXEC: Undefined symbol: {{.}}/shared.so-x86-64: puts is enough? ruiu:* Maybe EXEC: Undefined symbol: {{.*}}/shared.so-x86-64: puts is enough?
		gariousAuthorUnsubmitted Not Done Reply Inline Actions Would that work if cross-compiling on Windows? garious: Would that work if cross-compiling on Windows?
	EXEC-NOT: Undefined symbol: {{[+-_A-Za-z0-9.\\/:]+}}shared.so-x86-64: weakfoo	SHLIB: Undefined symbol:
	SHLIB-NOT: Undefined symbol: {{[+-_A-Za-z0-9.\\/:]+}}shared.so-x86-64: weakfoo	SHLIB-NEXT: shared.so-x86-64: puts
		EXEC-NOT: shared.so-x86-64: weakfoo
		SHLIB-NOT: shared.so-x86-64: weakfoo
	SHLIB-NOUNDEF-NOT: Name: puts	SHLIB-NOUNDEF-NOT: Name: puts
	SHLIB-UNDEF-SYMBOLS: Name: puts	SHLIB-UNDEF-SYMBOLS: Name: puts
Context not available.

test/elf/filenotfound.test

	# Check that a file that cannot be found results in a proper error message			# Check that a file that cannot be found results in a proper error message
	RUN: not lld -flavor gnu -target x86_64 %p/Inputs/nofile.o 2>&1 \| FileCheck %s			RUN: not lld -flavor gnu -target x86_64 %p/Inputs/nofile.o 2>&1 \| FileCheck %s
	#CHECK: lld: cannot find file {{[+-_A-Za-z0-9.\\/:]+}}nofile.o			#CHECK: lld: cannot find file
				#CHECK-NEXT: nofile.o