This is an archive of the discontinued LLVM Phabricator instance.

Avoid false positive/negative test results from line directive interference
ClosedPublic

Authored by gberry on Jun 15 2015, 8:39 AM.

Download Raw Diff

Details

Reviewers

Summary

Change tested for strings in case the string block or block_1 or block_2 appears in the path to the test file, which would cause it to appear in the line directive, causing the test to fail.
Use FileCheck to get rid of one run of clang.

Diff Detail

Event Timeline

gberry updated this revision to Diff 27676.Jun 15 2015, 8:39 AM

gberry retitled this revision from to Disable preprocessor line directives to avoid false positive/negative test results.

gberry updated this object.

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

gberry added subscribers: Unknown Object (MLST), mcrosier.

LGTM. Might be worthwhile to FileCheckize the test, which would allow you to reduce the number of RUN lines.

This revision is now accepted and ready to land.Jun 15 2015, 9:52 AM

FileCheck-ize and use strings with spaces to reduce likelihood of line directive conflict.

Committed r240801

Revision Contents

Path

Size

test/

Preprocessor/

cxx_true.cpp

13 lines

Diff 27937

test/Preprocessor/cxx_true.cpp

	/* RUN: %clang_cc1 -E %s -x c++ \| grep block_1			/* RUN: %clang_cc1 -E %s -x c++ \| FileCheck -check-prefix CPP %s
	RUN: %clang_cc1 -E %s -x c++ \| not grep block_2			RUN: %clang_cc1 -E %s -x c \| FileCheck -check-prefix C %s
	RUN: %clang_cc1 -E %s -x c \| not grep block
	RUN: %clang_cc1 -E %s -x c++ -verify -Wundef			RUN: %clang_cc1 -E %s -x c++ -verify -Wundef
	*/			*/
	// expected-no-diagnostics			// expected-no-diagnostics

	#if true			#if true
	block_1			// CPP: test block_1
				// C-NOT: test block_1
				test block_1
	#endif			#endif

	#if false			#if false
	block_2			// CPP-NOT: test block_2
				// C-NOT: test block_2
				test block_2
	#endif			#endif