[llvm] r311299 - Fix archive-update.test after r311296.

[Kuba Mracek via llvm-commits]

Should be fixed in r311299.

Kuba

> On Aug 20, 2017, at 11:56 AM, Victor Leschuk via llvm-commits <llvm-commits at lists.llvm.org> wrote:
> 
> Hello Kuba, looks like this test is broken:
> 
> http://lab.llvm.org:8011/builders/llvm-clang-lld-x86_64-scei-ps4-windows10pro-fast/builds/11615/steps/test/logs/stdio
> 
> ********************
> Failing Tests (1):
>    LLVM :: Object/archive-update.test
> 
> Could you please take a look?
> 
> 
> On 08/20/2017 09:31 PM, Kuba Mracek via llvm-commits wrote:
>> Author: kuba.brecka
>> Date: Sun Aug 20 11:31:30 2017
>> New Revision: 311299
>> 
>> URL: http://llvm.org/viewvc/llvm-project?rev=311299&view=rev
>> Log:
>> Fix archive-update.test after r311296.
>> 
>> 
>> Modified:
>>    llvm/trunk/test/Object/archive-update.test
>> 
>> Modified: llvm/trunk/test/Object/archive-update.test
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/archive-update.test?rev=311299&r1=311298&r2=311299&view=diff
>> ==============================================================================
>> --- llvm/trunk/test/Object/archive-update.test (original)
>> +++ llvm/trunk/test/Object/archive-update.test Sun Aug 20 11:31:30 2017
>> @@ -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.
>> 
>> 
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at lists.llvm.org
>> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
> 
> -- 
> Best Regards,
> 
> Victor Leschuk | Software Engineer |Access Softek
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits