[PATCH] D35954: Reject merging of empty manifest.

[Eric Beckmann via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL309317: Add test to reject merging of empty manifest. (authored by ecbeckmann).

Changed prior to commit:
  https://reviews.llvm.org/D35954?vs=108512&id=108517#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D35954

Files:
  llvm/trunk/test/tools/llvm-mt/Inputs/empty.manifest
  llvm/trunk/test/tools/llvm-mt/xml_error.test


Index: llvm/trunk/test/tools/llvm-mt/xml_error.test
===================================================================
--- llvm/trunk/test/tools/llvm-mt/xml_error.test
+++ llvm/trunk/test/tools/llvm-mt/xml_error.test
@@ -1,11 +1,18 @@
 REQUIRES: libxml2
 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
 
+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:   %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


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D35954.108517.patch
Type: text/x-patch
Size: 976 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170727/5e3a1f06/attachment.bin>