From: Kuba Mracek Date: Sun, 20 Aug 2017 18:31:30 +0000 (+0000) Subject: Fix archive-update.test after r311296. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3ef5d9d5ddb0b40bea3f7bcb2163aeff0280acdb;p=llvm Fix archive-update.test after r311296. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@311299 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/test/Object/archive-update.test b/test/Object/archive-update.test index 669b116ce4b..eb68e8dca48 100644 --- a/test/Object/archive-update.test +++ b/test/Object/archive-update.test @@ -1,51 +1,51 @@ Test the 'u' option of llvm-ar RUN: rm -rf %t && mkdir -p %t && cd %t -RUN: rm -f %t.a +RUN: rm -f %t/tmp.a Create a file named evenlen that is newer than the evenlen on the source dir. -RUN: mkdir -p %t.older -RUN: echo older > %t.older/evenlen +RUN: mkdir -p %t/tmp.older +RUN: echo older > %t/tmp.older/evenlen -RUN: mkdir -p %t.newer +RUN: mkdir -p %t/tmp.newer Either the shell supports the 'touch' command with a flag to manually set the mtime or we sleep for over two seconds so that the mtime is definitely observable. -RUN: touch -m -t 200001010000 %t.older/evenlen || sleep 2.1 +RUN: touch -m -t 200001010000 %t/tmp.older/evenlen || sleep 2.1 -RUN: echo newer > %t.newer/evenlen -RUN: touch %t.newer/evenlen +RUN: echo newer > %t/tmp.newer/evenlen +RUN: touch %t/tmp.newer/evenlen Create an achive with the newest file -RUN: llvm-ar rU %t.a %t.newer/evenlen -RUN: llvm-ar p %t.a | FileCheck --check-prefix=NEWER %s +RUN: llvm-ar rU %t/tmp.a %t/tmp.newer/evenlen +RUN: llvm-ar p %t/tmp.a | FileCheck --check-prefix=NEWER %s Check that without the 'u' option the member is replaced with an older file. -RUN: llvm-ar rU %t.a %t.older/evenlen -RUN: llvm-ar p %t.a | FileCheck --check-prefix=OLDER %s +RUN: llvm-ar rU %t/tmp.a %t/tmp.older/evenlen +RUN: llvm-ar p %t/tmp.a | FileCheck --check-prefix=OLDER %s Check that with the 'u' option the member is replaced with a newer file. -RUN: llvm-ar ruU %t.a %t.newer/evenlen -RUN: llvm-ar p %t.a | FileCheck --check-prefix=NEWER %s +RUN: llvm-ar ruU %t/tmp.a %t/tmp.newer/evenlen +RUN: llvm-ar p %t/tmp.a | FileCheck --check-prefix=NEWER %s Check that with the 'u' option the member is not replaced with an older file. -RUN: llvm-ar ruU %t.a %t.older/evenlen -RUN: llvm-ar p %t.a | FileCheck --check-prefix=NEWER %s +RUN: llvm-ar ruU %t/tmp.a %t/tmp.older/evenlen +RUN: llvm-ar p %t/tmp.a | FileCheck --check-prefix=NEWER %s NEWER: newer OLDER: older -RUN: rm -f %t.a +RUN: rm -f %t/tmp.a RUN: echo foo > foo RUN: echo bar > bar -RUN: llvm-ar --format=gnu rcT %t.a foo -RUN: llvm-ar --format=gnu rcT %t.a bar -RUN: llvm-ar t %t.a | FileCheck --check-prefix=BOTH-FILES %s +RUN: llvm-ar --format=gnu rcT %t/tmp.a foo +RUN: llvm-ar --format=gnu rcT %t/tmp.a bar +RUN: llvm-ar t %t/tmp.a | FileCheck --check-prefix=BOTH-FILES %s BOTH-FILES: foo BOTH-FILES: bar -RUN: rm -f %t.a -RUN: llvm-ar --format=gnu rc %t.a foo -RUN: not llvm-ar --format=gnu rcT %t.a bar 2>&1 | FileCheck --check-prefix=ERROR %s +RUN: rm -f %t/tmp.a +RUN: llvm-ar --format=gnu rc %t/tmp.a foo +RUN: not llvm-ar --format=gnu rcT %t/tmp.a bar 2>&1 | FileCheck --check-prefix=ERROR %s ERROR: Cannot convert a regular archive to a thin one.