This is an archive of the discontinued LLVM Phabricator instance.

Reject merging of empty manifest.
ClosedPublic

Authored by ecbeckmann on Jul 27 2017, 11:46 AM.

Reviewers

ruiu
rnk

Commits

You are adding only a test. Is this what you want?

In D35954#823130, @ruiu wrote:

You are adding only a test. Is this what you want?

Yes, the actual code to check for empty manifest was in the last patch.

Then please change the commit message so that it says this patch adds a test for an empty manifest. LGTM

This revision is now accepted and ready to land.Jul 27 2017, 12:57 PM

This revision was automatically updated to reflect the committed changes.

Path

Size

llvm/

trunk/

test/

tools/

llvm-mt/

Inputs/

11 lines

The contents of this file were not changed.

	REQUIRES: libxml2			REQUIRES: libxml2
	UNSUPPORTED: windows			UNSUPPORTED: windows

	RUN: not llvm-mt /manifest %p/Inputs/bad.manifest 2>&1 >/dev/null \| FileCheck %s			RUN: not llvm-mt /manifest %p/Inputs/bad.manifest 2>&1 >/dev/null \| FileCheck \
				RUN: %s

	CHECK: llvm-mt error: invalid xml document			CHECK: llvm-mt error: invalid xml document

				RUN: not llvm-mt /manifest %p/Inputs/empty.manifest 2>&1 >/dev/null \| \
				RUN: FileCheck %s -check-prefix=EMPTY

				EMPTY: llvm-mt error: attempted to merge empty manifest

	RUN: llvm-mt /inputresource:foo.res /manifest \			RUN: llvm-mt /inputresource:foo.res /manifest \
	RUN: %p/Inputs/test_manifest.manifest \| FileCheck %s -check-prefix=NOT_SUPPORTED			RUN: %p/Inputs/test_manifest.manifest \| FileCheck %s \
				RUN: -check-prefix=NOT_SUPPORTED

	NOT_SUPPORTED: llvm-mt: ignoring unsupported 'inputresource:' option			NOT_SUPPORTED: llvm-mt: ignoring unsupported 'inputresource:' option