This is an archive of the discontinued LLVM Phabricator instance.

Differential D62930

[llvm-ar][test] Relax lit directory assumptions in thin-archive.test
ClosedPublic

Authored by rupprecht on Jun 5 2019, 1:17 PM.

Details

Reviewers
gbreynoo
Commits
rG146a154e610b: [llvm-ar][test] Relax lit directory assumptions in thin-archive.test
rL363189: [llvm-ar][test] Relax lit directory assumptions in thin-archive.test
Summary

thin-archive.test assumes the Output/<testname> structure that lit creates. Rewrite the test in a way that still tests the same thing (creating via relative path and adding via absolute path) but doesn't assume this specific lit structure, making it possible to run in a lit emulator.

Diff Detail

Event Timeline

rupprecht created this revision.Jun 5 2019, 1:17 PM
Herald added a project: Restricted Project. · View Herald TranscriptJun 5 2019, 1:17 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster completed remote builds in B32957: Diff 203238.Jun 5 2019, 1:17 PM
gbreynoo accepted this revision.Jun 12 2019, 6:02 AM

LGTM

This revision is now accepted and ready to land.Jun 12 2019, 6:02 AM
Closed by commit rL363189: [llvm-ar][test] Relax lit directory assumptions in thin-archive.test (authored by rupprecht). · Explain WhyJun 12 2019, 11:38 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
test/
tools/
llvm-ar/
12 lines

Diff 203238

llvm/test/tools/llvm-ar/thin-archive.test

RUN: rm -rf %t && mkdir -p %t/foo/bar/ RUN: rm -rf %t && mkdir -p %t/foo/bar/
RUN: yaml2obj %S/Inputs/elf.yaml -o %t/foo/elf.o RUN: yaml2obj %S/Inputs/elf.yaml -o %t/foo/elf.o
RUN: cp %t/foo/elf.o %t/foo/bar/elf.o RUN: cp %t/foo/elf.o %t/foo/bar/elf.o
RUN: cp %t/foo/bar/elf.o %t/delete.o RUN: cp %t/foo/bar/elf.o %t/delete.o
Test that modules can be added with absolute paths when the archive is created using an absolute path Test that modules can be added with absolute paths when the archive is created using an absolute path
RUN: llvm-ar rTc %t/absolute-1.ar %t/foo/elf.o %t/delete.o %t/foo/bar/elf.o RUN: llvm-ar rTc %t/absolute-1.ar %t/foo/elf.o %t/delete.o %t/foo/bar/elf.o
RUN: llvm-ar dT %t/absolute-1.ar delete.o RUN: llvm-ar dT %t/absolute-1.ar delete.o
RUN: FileCheck -input-file=%t/absolute-1.ar --check-prefixes=THIN,CHECK %s -DPATH=%/t/ RUN: FileCheck -input-file=%t/absolute-1.ar --check-prefixes=THIN,CHECK %s -DPATH=%/t/
RUN: llvm-ar t %t/absolute-1.ar | FileCheck %s -DPATH=%/t/ RUN: llvm-ar t %t/absolute-1.ar | FileCheck %s -DPATH=%/t/
Test that modules can be added with absolute paths when the archive is created using a relative path These tests must be run in %t/foo. cd %t is included on each line to make debugging this test case easier.
RUN: llvm-ar rTc Output/%basename_t.tmp/absolute-2.ar %t/foo/elf.o %t/delete.o %t/foo/bar/elf.o Test that modules can be added with absolute paths when the archive is created using a relative path
RUN: llvm-ar dT Output/%basename_t.tmp/absolute-2.ar %t/delete.o
RUN: FileCheck -input-file=%t/absolute-2.ar --check-prefixes=THIN,CHECK %s -DPATH=%/t/ RUN: cd %t/foo && llvm-ar rTc bar/absolute-2.ar %t/foo/elf.o %t/delete.o %t/foo/bar/elf.o
RUN: llvm-ar t %t/absolute-2.ar | FileCheck %s -DPATH=%/t/ RUN: cd %t/foo && llvm-ar dT bar/absolute-2.ar %t/delete.o
These tests must be run in %t/foo. cd %t is included on each line to make debugging this test case easier. RUN: FileCheck -input-file=%t/foo/bar/absolute-2.ar --check-prefixes=THIN,CHECK %s -DPATH=%/t/
RUN: llvm-ar t %t/foo/bar/absolute-2.ar | FileCheck %s -DPATH=%/t/
Test that modules can be added with relative paths when the archive is created using a relative path Test that modules can be added with relative paths when the archive is created using a relative path
RUN: cd %t/foo && llvm-ar rTc ../relative-1.ar elf.o ../delete.o bar/elf.o RUN: cd %t/foo && llvm-ar rTc ../relative-1.ar elf.o ../delete.o bar/elf.o
RUN: cd %t/foo && llvm-ar dT ../relative-1.ar delete.o RUN: cd %t/foo && llvm-ar dT ../relative-1.ar delete.o
RUN: FileCheck -input-file=%t/relative-1.ar --check-prefixes=THIN,CHECK %s -DPATH= RUN: FileCheck -input-file=%t/relative-1.ar --check-prefixes=THIN,CHECK %s -DPATH=
RUN: llvm-ar t %t/relative-1.ar | FileCheck %s -DPATH=%/t/ RUN: llvm-ar t %t/relative-1.ar | FileCheck %s -DPATH=%/t/
Show All 14 Lines