[llvm] r366908 - [llvm-ar][test] Fix move operation tests

[Owen Reynolds via llvm-commits]

Author: gbreynoo
Date: Wed Jul 24 07:26:18 2019
New Revision: 366908

URL: http://llvm.org/viewvc/llvm-project?rev=366908&view=rev
Log:
[llvm-ar][test] Fix move operation tests

This fixes two tests that did not remove existing archives
before testing due to mistyped archive names.

Modified:
    llvm/trunk/test/tools/llvm-ar/move-after.test
    llvm/trunk/test/tools/llvm-ar/move-before.test

Modified: llvm/trunk/test/tools/llvm-ar/move-after.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-ar/move-after.test?rev=366908&r1=366907&r2=366908&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-ar/move-after.test (original)
+++ llvm/trunk/test/tools/llvm-ar/move-after.test Wed Jul 24 07:26:18 2019
@@ -6,7 +6,7 @@ RUN: touch %t3.txt
 RUN: touch %t4.txt
 
 # Move one file:
-RUN: rm -f %t-one.ar
+RUN: rm -f %t-one.a
 RUN: llvm-ar rc %t-one.a %t1.txt %t2.txt %t3.txt
 RUN: llvm-ar ma %t1.txt %t-one.a %t3.txt
 RUN: llvm-ar t %t-one.a | FileCheck %s --check-prefix=ONE
@@ -16,7 +16,7 @@ ONE-NEXT: 3.txt
 ONE-NEXT: 2.txt
 
 # Move file to back:
-RUN: rm -f %t-back.ar
+RUN: rm -f %t-back.a
 RUN: llvm-ar rc %t-back.a %t1.txt %t2.txt %t3.txt
 RUN: llvm-ar ma %t2.txt %t-back.a %t1.txt
 RUN: llvm-ar t %t-back.a | FileCheck %s --check-prefix=BACK
@@ -26,7 +26,7 @@ BACK-NEXT: 1.txt
 BACK-NEXT: 3.txt
 
 # Move multiple files:
-RUN: rm -f %t-multiple.ar
+RUN: rm -f %t-multiple.a
 RUN: llvm-ar rc %t-multiple.a %t1.txt %t2.txt %t3.txt %t4.txt
 RUN: llvm-ar ma %t1.txt %t-multiple.a  %t4.txt %t3.txt
 RUN: llvm-ar t %t-multiple.a | FileCheck %s --check-prefix=MULTIPLE
@@ -37,7 +37,7 @@ MULTIPLE-NEXT: 4.txt
 MULTIPLE-NEXT: 2.txt
 
 # Move after invalid file:
-RUN: rm -f %t-invalid.ar
+RUN: rm -f %t-invalid.a
 RUN: llvm-ar rc %t-invalid.a %t1.txt %t2.txt %t3.txt
 RUN: not llvm-ar ma invalid.txt %t-invalid.a %t2.txt 2>&1 \
 RUN:   | FileCheck %s --check-prefix=ERROR
@@ -49,7 +49,7 @@ INVALID-NEXT: 2.txt
 INVALID-NEXT: 3.txt
 
 # Move file to the same position:
-RUN: rm -f %t-position.ar
+RUN: rm -f %t-position.a
 RUN: llvm-ar rc %t-position.a %t1.txt %t2.txt %t3.txt
 RUN: llvm-ar ma %t1.txt %t-position.a %t2.txt
 RUN: llvm-ar t %t-position.a | FileCheck %s --check-prefix=POSITION

Modified: llvm/trunk/test/tools/llvm-ar/move-before.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-ar/move-before.test?rev=366908&r1=366907&r2=366908&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-ar/move-before.test (original)
+++ llvm/trunk/test/tools/llvm-ar/move-before.test Wed Jul 24 07:26:18 2019
@@ -6,7 +6,7 @@ RUN: touch %t3.txt
 RUN: touch %t4.txt
 
 # Move one file:
-RUN: rm -f %t-one.ar
+RUN: rm -f %t-one.a
 RUN: llvm-ar rc %t-one.a %t1.txt %t2.txt %t3.txt
 RUN: llvm-ar mb %t2.txt %t-one.a %t3.txt
 RUN: llvm-ar t %t-one.a | FileCheck %s --check-prefix=ONE
@@ -16,17 +16,17 @@ ONE-NEXT: 3.txt
 ONE-NEXT: 2.txt
 
 # Move file to front:
-RUN: rm -f %t-front.ar
-RUN: llvm-ar rc %t-front.ar %t1.txt %t2.txt %t3.txt
-RUN: llvm-ar mb %t1.txt %t-front.ar %t3.txt
-RUN: llvm-ar t %t-front.ar | FileCheck %s --check-prefix=FRONT
+RUN: rm -f %t-front.a
+RUN: llvm-ar rc %t-front.a %t1.txt %t2.txt %t3.txt
+RUN: llvm-ar mb %t1.txt %t-front.a %t3.txt
+RUN: llvm-ar t %t-front.a | FileCheck %s --check-prefix=FRONT
 
 FRONT:      3.txt
 FRONT-NEXT: 1.txt
 FRONT-NEXT: 2.txt
 
 # Move multiple files:
-RUN: rm -f %t-multiple.ar
+RUN: rm -f %t-multiple.a
 RUN: llvm-ar rc %t-multiple.a %t1.txt %t2.txt %t3.txt %t4.txt
 RUN: llvm-ar mb %t2.txt %t-multiple.a %t4.txt %t3.txt
 RUN: llvm-ar t %t-multiple.a | FileCheck %s --check-prefix=MULTIPLE
@@ -37,7 +37,7 @@ MULTIPLE-NEXT: 4.txt
 MULTIPLE-NEXT: 2.txt
 
 # Move before invalid file:
-RUN: rm -f %t-invalid.ar
+RUN: rm -f %t-invalid.a
 RUN: llvm-ar rc %t-invalid.a %t1.txt %t2.txt %t3.txt
 RUN: not llvm-ar mb invalid.txt %t-invalid.a %t2.txt 2>&1 \
 RUN:   | FileCheck %s --check-prefix=ERROR
@@ -49,7 +49,7 @@ INVALID-NEXT: 2.txt
 INVALID-NEXT: 3.txt
 
 # Move file to the same position:
-RUN: rm -f %t-position.ar
+RUN: rm -f %t-position.a
 RUN: llvm-ar rc %t-position.a %t1.txt %t2.txt %t3.txt
 RUN: llvm-ar mb %t3.txt %t-position.a %t2.txt
 RUN: llvm-ar t %t-position.a | FileCheck %s --check-prefix=POSITION
@@ -59,10 +59,10 @@ POSITION-NEXT: 2.txt
 POSITION-NEXT: 3.txt
 
 # Move file after itself:
-RUN: rm -f %t-same.ar
-RUN: llvm-ar rc %t-same.ar %t1.txt %t2.txt %t3.txt
-RUN: llvm-ar mb %t2.txt %t-same.ar %t2.txt
-RUN: llvm-ar t %t-same.ar | FileCheck %s --check-prefix=SAME
+RUN: rm -f %t-same.a
+RUN: llvm-ar rc %t-same.a %t1.txt %t2.txt %t3.txt
+RUN: llvm-ar mb %t2.txt %t-same.a %t2.txt
+RUN: llvm-ar t %t-same.a | FileCheck %s --check-prefix=SAME
 
 SAME:      1.txt
 SAME-NEXT: 2.txt