[llvm] r309142 - Diffing against a file that is itself used in the test seems to be a bad

Eric Beckmann via llvm-commits llvm-commits at lists.llvm.org
Wed Jul 26 10:47:45 PDT 2017


Author: ecbeckmann
Date: Wed Jul 26 10:47:44 2017
New Revision: 309142

URL: http://llvm.org/viewvc/llvm-project?rev=309142&view=rev
Log:
Diffing against a file that is itself used in the test seems to be a bad
idea, because it might get locked down and rendered unopenable.

Modified:
    llvm/trunk/test/tools/llvm-mt/single_file.test

Modified: llvm/trunk/test/tools/llvm-mt/single_file.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-mt/single_file.test?rev=309142&r1=309141&r2=309142&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-mt/single_file.test (original)
+++ llvm/trunk/test/tools/llvm-mt/single_file.test Wed Jul 26 10:47:44 2017
@@ -2,4 +2,28 @@ REQUIRES: libxml2
 UNSUPPORTED: windows
 
 RUN: llvm-mt /manifest %p/Inputs/test_manifest.manifest /out:%t
-RUN: diff %p/Inputs/test_manifest.manifest %t
+RUN: FileCheck %s --input-file=%t
+
+CHECK:      <?xml version="1.0"?>
+CHECK-NEXT: <assembly xmlns="urn:schemas-microsoft-com:asm.v1">
+CHECK-NEXT:   <trustInfo>
+CHECK-NEXT:     <security>
+CHECK-NEXT:       <requestedPrivileges>
+CHECK-NEXT:         <requestedExecutionLevel level="3" uiAccess="1"/>
+CHECK-NEXT:       </requestedPrivileges>
+CHECK-NEXT:     </security>
+CHECK-NEXT:   </trustInfo>
+CHECK-NEXT:   <dependency>
+CHECK-NEXT:     <dependentAssembly>
+CHECK-NEXT:       <assemblyIdentity program="displayDriver"/>
+CHECK-NEXT:     </dependentAssembly>
+CHECK-NEXT:   </dependency>
+CHECK-NEXT:   <compatibility>
+CHECK-NEXT:     <dependency>
+CHECK-NEXT:       <assemblyIdentity program="compatibilityCheck1"/>
+CHECK-NEXT:     </dependency>
+CHECK-NEXT:     <application>
+CHECK-NEXT:       <supportedOS Id="FooOS"/>
+CHECK-NEXT:     </application>
+CHECK-NEXT:   </compatibility>
+CHECK-NEXT: </assembly>




More information about the llvm-commits mailing list