This is an archive of the discontinued LLVM Phabricator instance.

Differential D39531

[test] Move llvm-lib tests into tools/llvm-lib. NFC.
ClosedPublic

Authored by mstorsjo on Nov 2 2017, 1:08 AM.

Details

Reviewers
pcc
ruiu
Commits
rG20910f46b60f: [test] Move llvm-lib tests into tools/llvm-lib. NFC.
rL317262: [test] Move llvm-lib tests into tools/llvm-lib. NFC.
Summary

Similarly to SVN r317189 for llvm-dlltool, these are probably easier to find in a tools subdirectory with a name identical to the tool, than in a toplevel directory with a different name.

This matches the move of LibDriver itself in SVN r302995.

Diff Detail

Repository
rL LLVM

Event Timeline

mstorsjo created this revision.Nov 2 2017, 1:08 AM
Herald added a subscriber: mehdi_amini. · View Herald TranscriptNov 2 2017, 1:08 AM
ruiu accepted this revision.Nov 2 2017, 10:42 AM

LGTM

This revision is now accepted and ready to land.Nov 2 2017, 10:42 AM
Closed by commit rL317262: [test] Move llvm-lib tests into tools/llvm-lib. NFC. (authored by mstorsjo). · Explain WhyNov 2 2017, 1:05 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
trunk/
test/
LibDriver/
Inputs/
2 lines
2 lines
16 lines
2 lines
15 lines
3 lines
2 lines
3 lines
9 lines
24 lines
tools/
llvm-lib/
Inputs/
2 lines
2 lines
16 lines
2 lines
15 lines
3 lines
2 lines
3 lines
9 lines
24 lines

Diff 121347

llvm/trunk/test/LibDriver/Inputs/a.s

.globl a
a:

llvm/trunk/test/LibDriver/Inputs/b.s

.globl b
b:

llvm/trunk/test/LibDriver/Inputs/cl-gl.obj

  • This is a binary file.

llvm/trunk/test/LibDriver/Inputs/resource.res

  • This is a binary file.

llvm/trunk/test/LibDriver/infer-output-path.test

RUN: rm -rf %t && mkdir -p %t
RUN: llvm-mc -triple=x86_64-pc-windows-msvc -filetype=obj -o %t/a.obj %S/Inputs/a.s
RUN: llvm-mc -triple=x86_64-pc-windows-msvc -filetype=obj -o %t/b.o %S/Inputs/b.s
RUN: llvm-mc -triple=x86_64-pc-windows-msvc -filetype=obj -o %t/c %S/Inputs/b.s
RUN: rm -f %t/a.lib
RUN: llvm-lib %t/a.obj
RUN: test -e %t/a.lib
RUN: rm -f %t/b.lib
RUN: llvm-lib /libpath:%t b.o
RUN: test -e %t/b.lib
RUN: rm -f %t/c.lib
RUN: llvm-lib /libpath:%t c
RUN: test -e %t/c.lib

llvm/trunk/test/LibDriver/invalid.test

RUN: not llvm-lib %S/Inputs/cl-gl.obj 2>&1 | FileCheck %s
CHECK: not a COFF object, bitcode or resource file

llvm/trunk/test/LibDriver/libpath.test

RUN: mkdir -p %t/a %t/b
RUN: llvm-mc -triple=x86_64-pc-windows-msvc -filetype=obj -o %t/a/foo.obj %S/Inputs/a.s
RUN: llvm-mc -triple=x86_64-pc-windows-msvc -filetype=obj -o %t/b/foo.obj %S/Inputs/b.s
RUN: env "LIB=%t/a;%t/b" llvm-lib /out:%t1.lib foo.obj
RUN: llvm-nm %t1.lib | FileCheck --check-prefix=A %s
RUN: llvm-lib /out:%t2.lib /libpath:%t/a /libpath:%t/b foo.obj
RUN: llvm-nm %t2.lib | FileCheck --check-prefix=A %s
RUN: env LIB=%t/a llvm-lib /libpath:%t/b /out:%t3.lib foo.obj
RUN: llvm-nm %t3.lib | FileCheck --check-prefix=B %s
A: T a
B: T b

llvm/trunk/test/LibDriver/lit.local.cfg

if not 'X86' in config.root.targets:
config.unsupported = True

llvm/trunk/test/LibDriver/no-inputs.test

RUN: llvm-lib -out:%t.a
RUN: test ! -e %t.a

llvm/trunk/test/LibDriver/resource.test

RUN: llvm-lib /out:%t %S/Inputs/resource.res
RUN: llvm-ar t %t | FileCheck %s
CHECK: resource.res

llvm/trunk/test/LibDriver/thin.test

RUN: llvm-mc -triple=x86_64-pc-windows-msvc -filetype=obj -o %t %S/Inputs/a.s
RUN: llvm-lib -out:%t.a %t
RUN: FileCheck --check-prefix=FAT %s < %t.a
FAT: !<arch>
RUN: llvm-lib -out:%t.thin.a -llvmlibthin %t
RUN: FileCheck --check-prefix=THIN %s < %t.thin.a
THIN: !<thin>

llvm/trunk/test/LibDriver/use-paths.test

llvm-lib should behave like "link.exe /lib" and use relative paths to describe
archive members.
First, get in a clean working directory.
RUN: rm -rf %t && mkdir -p %t && cd %t
Make foo/a.obj and foo/b.obj.
RUN: mkdir foo
RUN: llvm-mc -triple=x86_64-pc-windows-msvc -filetype=obj -o foo/a.obj %S/Inputs/a.s
RUN: llvm-mc -triple=x86_64-pc-windows-msvc -filetype=obj -o foo/b.obj %S/Inputs/b.s
RUN: llvm-lib -out:foo.lib foo/a.obj foo/b.obj
RUN: llvm-ar t foo.lib | FileCheck %s
FIXME: We should probably use backslashes on Windows to better match MSVC tools.
CHECK: foo/a.obj
CHECK: foo/b.obj
Do it again with absolute paths and see that we get something.
RUN: llvm-lib -out:foo.lib %t/foo/a.obj %t/foo/b.obj
RUN: llvm-ar t foo.lib | FileCheck %s --check-prefix=ABS
ABS: {{.*}}/foo/a.obj
ABS: {{.*}}/foo/b.obj

llvm/trunk/test/tools/llvm-lib/Inputs/a.s

.globl a
a:

llvm/trunk/test/tools/llvm-lib/Inputs/b.s

.globl b
b:

llvm/trunk/test/tools/llvm-lib/Inputs/cl-gl.obj

  • This is a binary file.
PropertyOld ValueNew Value
svn:executablenull*
\ No newline at end of property
svn:mime-typenullapplication/octet-stream
\ No newline at end of property

llvm/trunk/test/tools/llvm-lib/Inputs/resource.res

  • This is a binary file.
PropertyOld ValueNew Value
svn:mime-typenullapplication/octet-stream
\ No newline at end of property

llvm/trunk/test/tools/llvm-lib/infer-output-path.test

RUN: rm -rf %t && mkdir -p %t
RUN: llvm-mc -triple=x86_64-pc-windows-msvc -filetype=obj -o %t/a.obj %S/Inputs/a.s
RUN: llvm-mc -triple=x86_64-pc-windows-msvc -filetype=obj -o %t/b.o %S/Inputs/b.s
RUN: llvm-mc -triple=x86_64-pc-windows-msvc -filetype=obj -o %t/c %S/Inputs/b.s
RUN: rm -f %t/a.lib
RUN: llvm-lib %t/a.obj
RUN: test -e %t/a.lib
RUN: rm -f %t/b.lib
RUN: llvm-lib /libpath:%t b.o
RUN: test -e %t/b.lib
RUN: rm -f %t/c.lib
RUN: llvm-lib /libpath:%t c
RUN: test -e %t/c.lib

llvm/trunk/test/tools/llvm-lib/invalid.test

RUN: not llvm-lib %S/Inputs/cl-gl.obj 2>&1 | FileCheck %s
CHECK: not a COFF object, bitcode or resource file

llvm/trunk/test/tools/llvm-lib/libpath.test

RUN: mkdir -p %t/a %t/b
RUN: llvm-mc -triple=x86_64-pc-windows-msvc -filetype=obj -o %t/a/foo.obj %S/Inputs/a.s
RUN: llvm-mc -triple=x86_64-pc-windows-msvc -filetype=obj -o %t/b/foo.obj %S/Inputs/b.s
RUN: env "LIB=%t/a;%t/b" llvm-lib /out:%t1.lib foo.obj
RUN: llvm-nm %t1.lib | FileCheck --check-prefix=A %s
RUN: llvm-lib /out:%t2.lib /libpath:%t/a /libpath:%t/b foo.obj
RUN: llvm-nm %t2.lib | FileCheck --check-prefix=A %s
RUN: env LIB=%t/a llvm-lib /libpath:%t/b /out:%t3.lib foo.obj
RUN: llvm-nm %t3.lib | FileCheck --check-prefix=B %s
A: T a
B: T b

llvm/trunk/test/tools/llvm-lib/lit.local.cfg

if not 'X86' in config.root.targets:
config.unsupported = True

llvm/trunk/test/tools/llvm-lib/no-inputs.test

RUN: llvm-lib -out:%t.a
RUN: test ! -e %t.a

llvm/trunk/test/tools/llvm-lib/resource.test

RUN: llvm-lib /out:%t %S/Inputs/resource.res
RUN: llvm-ar t %t | FileCheck %s
CHECK: resource.res

llvm/trunk/test/tools/llvm-lib/thin.test

RUN: llvm-mc -triple=x86_64-pc-windows-msvc -filetype=obj -o %t %S/Inputs/a.s
RUN: llvm-lib -out:%t.a %t
RUN: FileCheck --check-prefix=FAT %s < %t.a
FAT: !<arch>
RUN: llvm-lib -out:%t.thin.a -llvmlibthin %t
RUN: FileCheck --check-prefix=THIN %s < %t.thin.a
THIN: !<thin>

llvm/trunk/test/tools/llvm-lib/use-paths.test

llvm-lib should behave like "link.exe /lib" and use relative paths to describe
archive members.
First, get in a clean working directory.
RUN: rm -rf %t && mkdir -p %t && cd %t
Make foo/a.obj and foo/b.obj.
RUN: mkdir foo
RUN: llvm-mc -triple=x86_64-pc-windows-msvc -filetype=obj -o foo/a.obj %S/Inputs/a.s
RUN: llvm-mc -triple=x86_64-pc-windows-msvc -filetype=obj -o foo/b.obj %S/Inputs/b.s
RUN: llvm-lib -out:foo.lib foo/a.obj foo/b.obj
RUN: llvm-ar t foo.lib | FileCheck %s
FIXME: We should probably use backslashes on Windows to better match MSVC tools.
CHECK: foo/a.obj
CHECK: foo/b.obj
Do it again with absolute paths and see that we get something.
RUN: llvm-lib -out:foo.lib %t/foo/a.obj %t/foo/b.obj
RUN: llvm-ar t foo.lib | FileCheck %s --check-prefix=ABS
ABS: {{.*}}/foo/a.obj
ABS: {{.*}}/foo/b.obj
llvm/trunk/test/LibDriver/libpath.test