Index: test/tools/llvm-ar/move.test
===================================================================
--- test/tools/llvm-ar/move.test
+++ test/tools/llvm-ar/move.test
@@ -0,0 +1,129 @@
+## Test the move command without modifiers moves members to the end
+
+# RUN: rm -rf %t && mkdir -p %t
+# RUN: yaml2obj %s -o %t/1.o --docnum=1
+# RUN: yaml2obj %s -o %t/2.o --docnum=2
+# RUN: yaml2obj %s -o %t/3.o --docnum=3
+
+## Move single member:
+# RUN: llvm-ar rc %t/single.a %t/1.o %t/2.o %t/3.o
+# RUN: llvm-ar m %t/single.a %t/1.o
+# RUN: llvm-ar t %t/single.a \
+# RUN:   | FileCheck %s --check-prefix=SINGLE --match-full-lines --implicit-check-not {{.}}
+
+# SINGLE:      2.o
+# SINGLE-NEXT: 3.o
+# SINGLE-NEXT: 1.o
+
+# RUN: llvm-nm --print-armap %t/single.a \
+# RUN:   | FileCheck %s --check-prefix=SINGLE-SYM
+
+# SINGLE-SYM:      symbol2
+# SINGLE-SYM-NEXT: symbol3
+# SINGLE-SYM-NEXT: symbol1
+
+## Move multiple members:
+# RUN: llvm-ar rc %t/multiple.a %t/1.o %t/2.o %t/3.o
+# RUN: llvm-ar m %t/multiple.a %t/1.o %t/2.o
+# RUN: llvm-ar t %t/multiple.a \
+# RUN:   | FileCheck %s --check-prefix=MULTIPLE --match-full-lines --implicit-check-not {{.}}
+
+# MULTIPLE:      3.o
+# MULTIPLE-NEXT: 1.o
+# MULTIPLE-NEXT: 2.o
+
+# RUN: llvm-nm --print-armap %t/multiple.a \
+# RUN:   | FileCheck %s --check-prefix=MULTIPLE-SYM
+
+# MULTIPLE-SYM:      symbol3
+# MULTIPLE-SYM-NEXT: symbol1
+# MULTIPLE-SYM-NEXT: symbol2
+
+## Move same member:
+# RUN: llvm-ar rc %t/same.a %t/1.o %t/2.o %t/3.o
+# RUN: llvm-ar m %t/same.a %t/1.o %t/1.o
+# RUN: llvm-ar t %t/same.a \
+# RUN:   | FileCheck %s --check-prefix=SAME -DFILE=%t/2.o
+
+# SAME:      2.o
+# SAME-NEXT: 3.o
+# SAME-NEXT: 1.o
+
+# RUN: llvm-nm --print-armap %t/same.a \
+# RUN:   | FileCheck %s --check-prefix=SAME-SYM
+
+# SAME-SYM:      symbol2
+# SAME-SYM-NEXT: symbol3
+# SAME-SYM-NEXT: symbol1
+
+## Move without member:
+# RUN: llvm-ar rc %t/without.a %t/1.o %t/2.o %t/3.o
+# RUN: llvm-ar m %t/without.a
+# RUN: llvm-ar t %t/without.a \
+# RUN:   | FileCheck %s --match-full-lines --check-prefix=WITHOUT --implicit-check-not {{.}}
+
+# WITHOUT:      1.o
+# WITHOUT-NEXT: 2.o
+# WITHOUT-NEXT: 3.o
+
+# RUN: llvm-nm --print-armap %t/without.a \
+# RUN:   | FileCheck %s --check-prefix=WITHOUT-SYM
+
+# WITHOUT-SYM:      symbol1
+# WITHOUT-SYM-NEXT: symbol2
+# WITHOUT-SYM-NEXT: symbol3
+
+## No archive:
+# RUN: not llvm-ar m 2>&1 \
+# RUN:   | FileCheck %s --check-prefix=NO-ARCHIVE
+
+# NO-ARCHIVE: error: An archive name must be specified.
+
+## Member does not exist:
+# RUN: llvm-ar rc %t/missing.a %t/1.o %t/2.o %t/3.o
+# RUN: not llvm-ar m %t/missing.a %t/missing.txt 2>&1 \
+# RUN:   | FileCheck %s --check-prefix=MISSING-FILE -DFILE=%t/missing.txt
+
+# MISSING-FILE: error: [[FILE]]: no such file or directory.
+
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS64
+  Data:    ELFDATA2LSB
+  Type:    ET_REL
+  Machine: EM_X86_64
+Sections:
+  - Name: .text
+    Type: SHT_PROGBITS
+Symbols:
+  - Name:    symbol1
+    Binding: STB_GLOBAL
+    Section: .text
+
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS64
+  Data:    ELFDATA2LSB
+  Type:    ET_REL
+  Machine: EM_X86_64
+Sections:
+  - Name: .text
+    Type: SHT_PROGBITS
+Symbols:
+  - Name:    symbol2
+    Binding: STB_GLOBAL
+    Section: .text
+
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS64
+  Data:    ELFDATA2LSB
+  Type:    ET_REL
+  Machine: EM_X86_64
+Sections:
+  - Name: .text
+    Type: SHT_PROGBITS
+Symbols:
+  - Name:    symbol3
+    Binding: STB_GLOBAL
+    Section: .text
Index: test/tools/llvm-ar/print.test
===================================================================
--- test/tools/llvm-ar/print.test
+++ test/tools/llvm-ar/print.test
@@ -0,0 +1,83 @@
+## Test Print output
+
+RUN: rm -rf %t && mkdir -p %t
+RUN: echo file1 > %t/1.txt
+RUN: echo file2 > %t/2.txt
+RUN: echo file3 > %t/3.txt
+
+RUN: llvm-ar -rc %t/archive.a %t/1.txt %t/2.txt %t/3.txt
+
+# Print without member:
+RUN: llvm-ar p %t/archive.a \
+RUN:   | FileCheck %s --check-prefix=WITHOUT --match-full-lines --implicit-check-not {{.}}
+
+WITHOUT:      file1
+WITHOUT-NEXT: file2
+WITHOUT-NEXT: file3
+
+RUN: llvm-ar pv %t/archive.a \
+RUN:   | FileCheck %s --check-prefix=WITHOUT-VERBOSE --match-full-lines --implicit-check-not {{.}}
+
+WITHOUT-VERBOSE:      Printing 1.txt
+WITHOUT-VERBOSE-NEXT: file1
+WITHOUT-VERBOSE-NEXT: Printing 2.txt
+WITHOUT-VERBOSE-NEXT: file2
+WITHOUT-VERBOSE-NEXT: Printing 3.txt
+WITHOUT-VERBOSE-NEXT: file3
+
+# Print single member:
+RUN: llvm-ar p %t/archive.a %t/2.txt  \
+RUN:   | FileCheck %s --check-prefix=SINGLE --match-full-lines --implicit-check-not {{.}}
+
+SINGLE: file2
+
+RUN: llvm-ar pv %t/archive.a %t/2.txt  \
+RUN:   | FileCheck %s --check-prefix=SINGLE-VERBOSE --match-full-lines --implicit-check-not {{.}}
+
+SINGLE-VERBOSE:      Printing 2.txt
+SINGLE-VERBOSE-NEXT: file2
+
+# Print multiple members:
+RUN: llvm-ar p %t/archive.a %t/2.txt %t/1.txt \
+RUN:   | FileCheck %s --check-prefix=MULTIPLE --match-full-lines --implicit-check-not {{.}}
+
+MULTIPLE:      file1
+MULTIPLE-NEXT: file2
+
+RUN: llvm-ar pv %t/archive.a %t/2.txt %t/1.txt \
+RUN:   | FileCheck %s --check-prefix=MULTIPLE-VERBOSE --match-full-lines --implicit-check-not {{.}}
+
+MULTIPLE-VERBOSE:      Printing 1.txt
+MULTIPLE-VERBOSE-NEXT: file1
+MULTIPLE-VERBOSE-NEXT: Printing 2.txt
+MULTIPLE-VERBOSE-NEXT: file2
+
+# Print same member:
+RUN: not llvm-ar p %t/archive.a %t/2.txt %t/2.txt 2>&1 \
+RUN:   | FileCheck %s --check-prefix=SAME -DFILE=%t/2.txt
+
+SAME-DAG: file2
+SAME-DAG: error: '[[FILE]]' was not found
+
+# Print same member when containing multiple members with shared name:
+llvm-ar -q %t/archive.a %t/2.txt
+RUN: not llvm-ar p %t/archive.a %t/2.txt %t/2.txt 2>&1 \
+RUN:   | FileCheck %s --check-prefix=SAME -DFILE=%t/2.txt
+
+# No archive:
+RUN: not llvm-ar p 2>&1 \
+RUN:   | FileCheck %s --check-prefix=NO-ARCHIVE
+
+NO-ARCHIVE: error: An archive name must be specified.
+
+# Archive does not exist:
+RUN: not llvm-ar p %t/missing.a 2>&1 \
+RUN:   | FileCheck %s --check-prefix=MISSING-ARCHIVE -DARCHIVE=%t/missing.a
+
+MISSING-ARCHIVE: error: error loading '[[ARCHIVE]]': no such file or directory.
+
+# Member does not exist:
+RUN: not llvm-ar p %t/archive.a %t-missing.txt 2>&1 \
+RUN:   | FileCheck %s --check-prefix=MISSING-FILE -DFILE=%t-missing.txt
+
+MISSING-FILE: error: '[[FILE]]' was not found
Index: test/tools/llvm-ar/quick-append.test
===================================================================
--- test/tools/llvm-ar/quick-append.test
+++ test/tools/llvm-ar/quick-append.test
@@ -0,0 +1,93 @@
+## Test quick append 
+
+# RUN: rm -rf %t && mkdir -p %t
+# RUN: yaml2obj %s -o %t/1.o --docnum=1
+# RUN: yaml2obj %s -o %t/2.o --docnum=2
+
+## Append single member:
+# RUN: llvm-ar qc %t/single.a %t/1.o
+# RUN: llvm-ar t %t/single.a \
+# RUN:   | FileCheck %s --check-prefix=SINGLE --match-full-lines --implicit-check-not {{.}}
+
+# SINGLE: 1.o
+
+# RUN: llvm-nm --print-armap %t/single.a \
+# RUN:   | FileCheck %s --check-prefix=SINGLE-SYM
+
+# SINGLE-SYM: symbol1
+
+## Append multiple members:
+# RUN: llvm-ar qc %t/multiple.a %t/1.o %t/2.o
+# RUN: llvm-ar t %t/multiple.a \
+# RUN:   | FileCheck %s --check-prefix=MULTIPLE --match-full-lines --implicit-check-not {{.}}
+
+# MULTIPLE:      1.o
+# MULTIPLE-NEXT: 2.o
+
+# RUN: llvm-nm --print-armap %t/multiple.a \
+# RUN:   | FileCheck %s --check-prefix=MULTIPLE-SYM
+
+# MULTIPLE-SYM:      symbol1
+# MULTIPLE-SYM-NEXT: symbol2
+
+## Append same member:
+# RUN: llvm-ar qc %t/same.a %t/1.o %t/1.o
+# RUN: llvm-ar t %t/same.a \
+# RUN:   | FileCheck %s --check-prefix=SAME -DFILE=%t/2.o --match-full-lines --implicit-check-not {{.}}
+
+# SAME:      1.o
+# SAME-NEXT: 1.o
+
+# RUN: llvm-nm --print-armap %t/same.a \
+# RUN:   | FileCheck %s --check-prefix=SAME-SYM
+
+# SAME-SYM:      symbol1
+# SAME-SYM-NEXT: symbol1
+
+## Append without member:
+# RUN: llvm-ar qc %t/without.a
+# RUN: llvm-ar t %t/without.a \
+# RUN:   | FileCheck /dev/null --allow-empty --implicit-check-not={{.}}
+
+# RUN: llvm-nm --print-armap %t/without.a \
+# RUN:   | FileCheck /dev/null --allow-empty --implicit-check-not={{.}}
+
+## No archive:
+# RUN: not llvm-ar qc 2>&1 \
+# RUN:   | FileCheck %s --check-prefix=NO-ARCHIVE
+
+# NO-ARCHIVE: error: An archive name must be specified.
+
+## Member does not exist:
+# RUN: not llvm-ar qc %t/missing.a %t/missing.txt 2>&1 \
+# RUN:   | FileCheck %s --check-prefix=MISSING-FILE -DFILE=%t/missing.txt
+
+# MISSING-FILE: error: [[FILE]]: no such file or directory.
+
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS64
+  Data:    ELFDATA2LSB
+  Type:    ET_REL
+  Machine: EM_X86_64
+Sections:
+  - Name: .text
+    Type: SHT_PROGBITS
+Symbols:
+  - Name:    symbol1
+    Binding: STB_GLOBAL
+    Section: .text
+
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS64
+  Data:    ELFDATA2LSB
+  Type:    ET_REL
+  Machine: EM_X86_64
+Sections:
+  - Name: .text
+    Type: SHT_PROGBITS
+Symbols:
+  - Name:    symbol2
+    Binding: STB_GLOBAL
+    Section: .text
Index: test/tools/llvm-ar/read-only-archive.test
===================================================================
--- test/tools/llvm-ar/read-only-archive.test
+++ test/tools/llvm-ar/read-only-archive.test
@@ -0,0 +1,30 @@
+## Test that read-only archives cannot be edited
+
+# RUN: rm -rf %t && mkdir -p %t
+# RUN: touch %t/1.txt
+# RUN: touch %t/2.txt
+# RUN: touch %t/3.txt
+
+# RUN: llvm-ar rc %t/archive.a %t/1.txt %t/2.txt
+
+## Make read only:
+# RUN: chmod 444 %t/archive.a
+
+# RUN: not llvm-ar r %t/archive.a %t/3.txt \
+# RUN:   FileCheck %s --check-prefix=ERROR -DFILE=%t/archive.a
+
+# ERROR: error: [[FILE]]: no such file or directory.
+
+# RUN: not llvm-ar q %t/archive.a %t/3.txt \
+# RUN:   FileCheck %s --check-prefix=ERROR -DFILE=%t/archive.a
+
+# RUN: not llvm-ar m %t/archive.a t/1.txt \
+# RUN:   FileCheck %s --check-prefix=ERROR-2 -DFILE=%t/archive.a
+
+# ERROR-2: error: [[FILE]]: permission denied.
+
+# RUN: llvm-ar t %t/archive.a \
+# RUN:   | FileCheck %s --check-prefix=ARCHIVE --match-full-lines --implicit-check-not {{.}}
+
+# ARCHIVE: 1.txt
+# ARCHIVE-NEXT: 2.txt