diff options
Diffstat (limited to 'lld/test')
| -rw-r--r-- | lld/test/COFF/manifestinput.test | 25 | ||||
| -rw-r--r-- | lld/test/lit.cfg | 5 |
2 files changed, 2 insertions, 28 deletions
diff --git a/lld/test/COFF/manifestinput.test b/lld/test/COFF/manifestinput.test index 4eb1730bb0e..7fc37c98fc5 100644 --- a/lld/test/COFF/manifestinput.test +++ b/lld/test/COFF/manifestinput.test @@ -8,28 +8,3 @@ CHECK: <?xml version="1.0" encoding="UTF-8" standalone="yes"?> CHECK: <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"><dependency><dependentAssembly><assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"></assemblyIdentity></dependentAssembly></dependency><trustInfo><security><requestedPrivileges><requestedExecutionLevel level="requireAdministrator" uiAccess="false"></requestedExecutionLevel></requestedPrivileges></security></trustInfo></assembly> - -# RUN: yaml2obj %p/Inputs/ret42.yaml > %t.obj -# RUN: lld-link /out:%t.exe /entry:main \ -# RUN: /manifest:embed \ -# RUN: /manifestuac:"level='requireAdministrator'" \ -# RUN: /manifestinput:%p/Inputs/manifestinput.test %t.obj -# RUN: llvm-readobj -coff-resources -file-headers %t.exe | FileCheck %s \ -# RUN: -check-prefix TEST_EMBED - -TEST_EMBED: ResourceTableRVA: 0x1000 -TEST_EMBED-NEXT: ResourceTableSize: 0x298 -TEST_EMBED-DAG: Resources [ -TEST_EMBED-NEXT: Total Number of Resources: 1 -TEST_EMBED-DAG: Number of String Entries: 0 -TEST_EMBED-NEXT: Number of ID Entries: 1 -TEST_EMBED-NEXT: Type: kRT_MANIFEST (ID 24) [ -TEST_EMBED-NEXT: Table Offset: 0x18 -TEST_EMBED-NEXT: Number of String Entries: 0 -TEST_EMBED-NEXT: Number of ID Entries: 1 -TEST_EMBED-NEXT: Name: (ID 1) [ -TEST_EMBED-NEXT: Table Offset: 0x30 -TEST_EMBED-NEXT: Number of String Entries: 0 -TEST_EMBED-NEXT: Number of ID Entries: 1 -TEST_EMBED-NEXT: Language: (ID 1033) [ -TEST_EMBED-NEXT: Entry Offset: 0x48 diff --git a/lld/test/lit.cfg b/lld/test/lit.cfg index cba56c64290..83df50957be 100644 --- a/lld/test/lit.cfg +++ b/lld/test/lit.cfg @@ -264,7 +264,6 @@ llvm_config_cmd.wait() # Set a fake constant version so that we get consitent output. config.environment['LLD_VERSION'] = 'LLD 1.0' -# Indirectly check if the mt.exe Microsoft utility exists by searching for -# cvtres, which always accompanies it. -if lit.util.which('cvtres', config.environment['PATH']): +# Check if the mt.exe Microsoft utility exists. +if lit.util.which('mt.exe', config.environment['PATH']): config.available_features.add('win_mt') |
