[lld] r195854 - [PECOFF] Remove extraneous command line options from tests.

Rui Ueyama ruiu at google.com
Wed Nov 27 09:43:54 PST 2013 

Author: ruiu
Date: Wed Nov 27 11:43:54 2013
New Revision: 195854

URL: http://llvm.org/viewvc/llvm-project?rev=195854&view=rev
Log:
[PECOFF] Remove extraneous command line options from tests.

Modified:
    lld/trunk/test/pecoff/bss-section.test
    lld/trunk/test/pecoff/dynamicbase.test
    lld/trunk/test/pecoff/grouped-sections.test
    lld/trunk/test/pecoff/hello.test
    lld/trunk/test/pecoff/manifest.test
    lld/trunk/test/pecoff/weak-external.test

Modified: lld/trunk/test/pecoff/bss-section.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/pecoff/bss-section.test?rev=195854&r1=195853&r2=195854&view=diff
==============================================================================
--- lld/trunk/test/pecoff/bss-section.test (original)
+++ lld/trunk/test/pecoff/bss-section.test Wed Nov 27 11:43:54 2013
@@ -1,4 +1,4 @@
-# RUN: lld -flavor link /out:%t /subsystem:console /force /opt:noref \
+# RUN: lld -flavor link /out:%t /subsystem:console /force \
 # RUN:    -- %p/Inputs/bss.obj && llvm-readobj -sections %t | FileCheck %s
 
 CHECK:       Section {

Modified: lld/trunk/test/pecoff/dynamicbase.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/pecoff/dynamicbase.test?rev=195854&r1=195853&r2=195854&view=diff
==============================================================================
--- lld/trunk/test/pecoff/dynamicbase.test (original)
+++ lld/trunk/test/pecoff/dynamicbase.test Wed Nov 27 11:43:54 2013
@@ -1,20 +1,20 @@
 # RUN: yaml2obj %p/Inputs/hello.obj.yaml > %t.obj
 #
-# RUN: lld -flavor link /out:%t1 /subsystem:console /opt:noref /force \
-# RUN:   -- %t.obj && llvm-readobj -file-headers %t1 \
-# RUN:   | FileCheck %s --check-prefix=DYNAMICBASE
+# RUN: lld -flavor link /out:%t1 /subsystem:console /force -- %t.obj
+# RUN: llvm-readobj -file-headers %t1 | FileCheck %s --check-prefix=DYNAMICBASE
 #
-# RUN: lld -flavor link /out:%t1 /subsystem:console /opt:noref /force \
-# RUN:   /dynamicbase:no -- %t.obj && llvm-readobj -file-headers %t1 \
-# RUN:   | FileCheck %s --check-prefix=NODYNAMICBASE
+# RUN: lld -flavor link /out:%t1 /subsystem:console /force /dynamicbase:no \
+# RUN:   -- %t.obj
+# RUN: llvm-readobj -file-headers %t1 | FileCheck %s \
+# RUN:   --check-prefix=NODYNAMICBASE
 #
-# RUN: lld -flavor link /out:%t1 /subsystem:console /opt:noref /force \
-# RUN:   /fixed -- %t.obj && llvm-readobj -file-headers %t1 \
-# RUN:   | FileCheck %s --check-prefix=NODYNAMICBASE
+# RUN: lld -flavor link /out:%t1 /subsystem:console /force /fixed -- %t.obj
+# RUN: llvm-readobj -file-headers %t1 | FileCheck %s \
+# RUN:   --check-prefix=NODYNAMICBASE
 #
-# RUN: not lld -flavor link /out:%t1 /subsystem:console /opt:noref /force \
-# RUN:   /fixed /dynamicbase -- %t.obj 2>&1 \
-# RUN:   | FileCheck %s --check-prefix=DYNAMIC-AND-FIXED
+# RUN: not lld -flavor link /out:%t1 /subsystem:console /force /fixed \
+# RUN:   /dynamicbase -- %t.obj 2> %t.err
+# RUN: FileCheck %s --check-prefix=DYNAMIC-AND-FIXED < %t.err
 
 DYNAMICBASE: IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE
 

Modified: lld/trunk/test/pecoff/grouped-sections.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/pecoff/grouped-sections.test?rev=195854&r1=195853&r2=195854&view=diff
==============================================================================
--- lld/trunk/test/pecoff/grouped-sections.test (original)
+++ lld/trunk/test/pecoff/grouped-sections.test Wed Nov 27 11:43:54 2013
@@ -1,6 +1,6 @@
 # RUN: yaml2obj %p/Inputs/grouped-sections.obj.yaml > %t.obj
 #
-# RUN: lld -flavor link /out:%t1 /subsystem:console /force \
+# RUN: lld -flavor link /out:%t1 /subsystem:console \
 # RUN:   -- %t.obj && llvm-objdump -s %t1 | FileCheck %s
 #
 # The file "grouped-sections.obj" has three data sections in the following

Modified: lld/trunk/test/pecoff/hello.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/pecoff/hello.test?rev=195854&r1=195853&r2=195854&view=diff
==============================================================================
--- lld/trunk/test/pecoff/hello.test (original)
+++ lld/trunk/test/pecoff/hello.test Wed Nov 27 11:43:54 2013
@@ -1,17 +1,15 @@
 # RUN: yaml2obj %p/Inputs/hello.obj.yaml > %t.obj
 
-# RUN: lld -flavor link /out:%t1 /subsystem:console /force /opt:noref \
-# RUN:   -- %t.obj \
-# RUN:   && llvm-readobj -file-headers %t1 | FileCheck -check-prefix=FILE %s
+# RUN: lld -flavor link /out:%t1 /subsystem:console /force -- %t.obj
+# RUN: llvm-readobj -file-headers %t1 | FileCheck -check-prefix=FILE %s
 
 FILE: ImageOptionalHeader {
 FILE:   SizeOfInitializedData: 1024
 FILE:   SizeOfHeaders: 512
 FILE: }
 
-# RUN: lld -flavor link /out:%t1 /subsystem:console /force /opt:noref \
-# RUN:   -- %t.obj \
-# RUN:   && llvm-readobj -sections %t1 | FileCheck -check-prefix=SECTIONS %s
+# RUN: lld -flavor link /out:%t1 /subsystem:console /force -- %t.obj
+# RUN: llvm-readobj -sections %t1 | FileCheck -check-prefix=SECTIONS %s
 
 SECTIONS:      Format: COFF-i386
 SECTIONS-NEXT: Arch: i386

Modified: lld/trunk/test/pecoff/manifest.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/pecoff/manifest.test?rev=195854&r1=195853&r2=195854&view=diff
==============================================================================
--- lld/trunk/test/pecoff/manifest.test (original)
+++ lld/trunk/test/pecoff/manifest.test Wed Nov 27 11:43:54 2013
@@ -1,6 +1,6 @@
 # RUN: yaml2obj %p/Inputs/nop.obj.yaml > %t.obj
 
-# RUN: lld -flavor link /out:%t1.exe /subsystem:console /force /opt:noref \
+# RUN: lld -flavor link /out:%t1.exe /subsystem:console /force \
 # RUN:   -- %t.obj
 # RUN: FileCheck -check-prefix=MANIFEST %s < %t1.exe.manifest
 
@@ -16,7 +16,7 @@ MANIFEST:     </security>
 MANIFEST:   </trustInfo>
 MANIFEST: </assembly>
 
-# RUN: lld -flavor link /out:%t2.exe /subsystem:console /force /opt:noref \
+# RUN: lld -flavor link /out:%t2.exe /subsystem:console /force \
 # RUN:   /manifestuac:"level='requireAdministrator' uiAccess='true'" -- %t.obj
 # RUN: FileCheck -check-prefix=UAC %s < %t2.exe.manifest
 
@@ -32,7 +32,7 @@ UAC:     </security>
 UAC:   </trustInfo>
 UAC: </assembly>
 
-# RUN: lld -flavor link /out:%t3.exe /subsystem:console /force /opt:noref \
+# RUN: lld -flavor link /out:%t3.exe /subsystem:console /force \
 # RUN:   /manifestdependency:"foo='bar'" -- %t.obj
 # RUN: FileCheck -check-prefix=DEPENDENCY %s < %t3.exe.manifest
 

Modified: lld/trunk/test/pecoff/weak-external.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/pecoff/weak-external.test?rev=195854&r1=195853&r2=195854&view=diff
==============================================================================
--- lld/trunk/test/pecoff/weak-external.test (original)
+++ lld/trunk/test/pecoff/weak-external.test Wed Nov 27 11:43:54 2013
@@ -1,7 +1,7 @@
 # RUN: yaml2obj %p/Inputs/weak-externals.obj.yaml > %t.obj
 
-# RUN: lld -flavor link /force  /out:%t.exe /subsystem:console /opt:noref \
-# RUN:    /entry:fn -- %t.obj %p/Inputs/static.lib 2> %t2.out
+# RUN: lld -flavor link /force /out:%t.exe /subsystem:console \
+# RUN:   /entry:fn -- %t.obj %p/Inputs/static.lib 2> %t2.out
 # RUN: FileCheck %s < %t2.out
 
 CHECK: _no_such_symbol1

More information about the llvm-commits mailing list