summaryrefslogtreecommitdiffstats
path: root/llvm/test/tools/llvm-ar
diff options
context:
space:
mode:
authorFangrui Song <maskray@google.com>2019-09-14 01:18:47 +0000
committerFangrui Song <maskray@google.com>2019-09-14 01:18:47 +0000
commit8a468031cd0b088d0f0b01df72d981885a6d4e89 (patch)
tree5f86f900959c2b37f18f0b4ed37ab16d4f8953b7 /llvm/test/tools/llvm-ar
parentc45fd0cad428f531c30f0629852aab2fcebe7b47 (diff)
downloadbcm5719-llvm-8a468031cd0b088d0f0b01df72d981885a6d4e89.tar.gz
bcm5719-llvm-8a468031cd0b088d0f0b01df72d981885a6d4e89.zip
[llvm-ar] Uncapitalize error messages and delete full stop
Most GNU binutils don't append full stops in error messages. This convention has been adopted by a bunch of LLVM binary utilities. Make llvm-ar follow the convention as well. Reviewed By: grimar Differential Revision: https://reviews.llvm.org/D67558 llvm-svn: 371912
Diffstat (limited to 'llvm/test/tools/llvm-ar')
-rw-r--r--llvm/test/tools/llvm-ar/count.test6
-rw-r--r--llvm/test/tools/llvm-ar/insert-after.test2
-rw-r--r--llvm/test/tools/llvm-ar/insert-before.test2
-rw-r--r--llvm/test/tools/llvm-ar/invalid-command-line.test2
-rw-r--r--llvm/test/tools/llvm-ar/move-after.test2
-rw-r--r--llvm/test/tools/llvm-ar/move-before.test2
-rw-r--r--llvm/test/tools/llvm-ar/move.test4
-rw-r--r--llvm/test/tools/llvm-ar/mri-addlib.test2
-rw-r--r--llvm/test/tools/llvm-ar/print.test4
-rw-r--r--llvm/test/tools/llvm-ar/quick-append.test4
-rw-r--r--llvm/test/tools/llvm-ar/read-only-archive.test4
-rw-r--r--llvm/test/tools/llvm-ar/replace.test4
12 files changed, 19 insertions, 19 deletions
diff --git a/llvm/test/tools/llvm-ar/count.test b/llvm/test/tools/llvm-ar/count.test
index 81b30bc1d6c..fa6141ff13f 100644
--- a/llvm/test/tools/llvm-ar/count.test
+++ b/llvm/test/tools/llvm-ar/count.test
@@ -31,9 +31,9 @@ RUN: not llvm-ar xN 4 %t/archive.a foo.txt 2>&1 | FileCheck %s --check-prefix=ER
# N only applies to x/d.
RUN: not llvm-ar rN 1 %t/archive.a foo.txt 2>&1 | FileCheck %s --check-prefix=ERR-BAD-OP
-ERR-NOT-NUM: error: Value for [count] must be numeric
-ERR-NOT-POS: error: Value for [count] must be positive
-ERR-BAD-OP: error: The 'N' modifier can only be specified with the 'x' or 'd' operations
+ERR-NOT-NUM: error: value for [count] must be numeric
+ERR-NOT-POS: error: value for [count] must be positive
+ERR-BAD-OP: error: the 'N' modifier can only be specified with the 'x' or 'd' operations
ERR-NOT-FOUND: error: 'foo.txt' was not found
# Extract individual items.
diff --git a/llvm/test/tools/llvm-ar/insert-after.test b/llvm/test/tools/llvm-ar/insert-after.test
index 7c01e736149..a3f51a6d4d7 100644
--- a/llvm/test/tools/llvm-ar/insert-after.test
+++ b/llvm/test/tools/llvm-ar/insert-after.test
@@ -43,7 +43,7 @@ RUN: not llvm-ar ra invalid.txt %t-invalid.a %t2.txt 2>&1 \
RUN: | FileCheck %s --check-prefix=ERROR
RUN: llvm-ar t %t-invalid.a | FileCheck %s --check-prefix=INVALID
-ERROR: error: Insertion point not found.
+ERROR: error: insertion point not found
INVALID: 1.txt
INVALID-NEXT: 2.txt
INVALID-NEXT: 3.txt
diff --git a/llvm/test/tools/llvm-ar/insert-before.test b/llvm/test/tools/llvm-ar/insert-before.test
index 4abf3a00028..f2a6bdd4e17 100644
--- a/llvm/test/tools/llvm-ar/insert-before.test
+++ b/llvm/test/tools/llvm-ar/insert-before.test
@@ -43,7 +43,7 @@ RUN: not llvm-ar rb invalid.txt %t-invalid.a %t2.txt 2>&1 \
RUN: | FileCheck %s --check-prefix=ERROR
RUN: llvm-ar t %t-invalid.a | FileCheck %s --check-prefix=INVALID
-ERROR: error: Insertion point not found.
+ERROR: error: insertion point not found
INVALID: 1.txt
INVALID-NEXT: 2.txt
INVALID-NEXT: 3.txt
diff --git a/llvm/test/tools/llvm-ar/invalid-command-line.test b/llvm/test/tools/llvm-ar/invalid-command-line.test
index 2bfcc1a457d..0dcd36a9c4e 100644
--- a/llvm/test/tools/llvm-ar/invalid-command-line.test
+++ b/llvm/test/tools/llvm-ar/invalid-command-line.test
@@ -1,5 +1,5 @@
Test that llvm-ar exits with 1 when there is an error.
RUN: not llvm-ar e 2>&1 | FileCheck %s
-CHECK: unknown option e.
+CHECK: error: unknown option e
CHECK: OVERVIEW: LLVM Archiver
diff --git a/llvm/test/tools/llvm-ar/move-after.test b/llvm/test/tools/llvm-ar/move-after.test
index 871d120c73b..8bd83216c68 100644
--- a/llvm/test/tools/llvm-ar/move-after.test
+++ b/llvm/test/tools/llvm-ar/move-after.test
@@ -43,7 +43,7 @@ RUN: not llvm-ar ma invalid.txt %t-invalid.a %t2.txt 2>&1 \
RUN: | FileCheck %s --check-prefix=ERROR
RUN: llvm-ar t %t-invalid.a | FileCheck %s --check-prefix=INVALID
-ERROR: error: Insertion point not found.
+ERROR: error: insertion point not found
INVALID: 1.txt
INVALID-NEXT: 2.txt
INVALID-NEXT: 3.txt
diff --git a/llvm/test/tools/llvm-ar/move-before.test b/llvm/test/tools/llvm-ar/move-before.test
index 15e27359d0e..bab8592f8f9 100644
--- a/llvm/test/tools/llvm-ar/move-before.test
+++ b/llvm/test/tools/llvm-ar/move-before.test
@@ -43,7 +43,7 @@ RUN: not llvm-ar mb invalid.txt %t-invalid.a %t2.txt 2>&1 \
RUN: | FileCheck %s --check-prefix=ERROR
RUN: llvm-ar t %t-invalid.a | FileCheck %s --check-prefix=INVALID
-ERROR: error: Insertion point not found.
+ERROR: error: insertion point not found
INVALID: 1.txt
INVALID-NEXT: 2.txt
INVALID-NEXT: 3.txt
diff --git a/llvm/test/tools/llvm-ar/move.test b/llvm/test/tools/llvm-ar/move.test
index 268fbf94cf1..e62b8ccd609 100644
--- a/llvm/test/tools/llvm-ar/move.test
+++ b/llvm/test/tools/llvm-ar/move.test
@@ -77,14 +77,14 @@
# RUN: not llvm-ar m 2>&1 \
# RUN: | FileCheck %s --check-prefix=NO-ARCHIVE
-# NO-ARCHIVE: error: An archive name must be specified.
+# 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]]: {{[nN]}}o such file or directory.
+# MISSING-FILE: error: [[FILE]]: {{[nN]}}o such file or directory
--- !ELF
FileHeader:
diff --git a/llvm/test/tools/llvm-ar/mri-addlib.test b/llvm/test/tools/llvm-ar/mri-addlib.test
index cf62acbf0b0..b213fd9e5c1 100644
--- a/llvm/test/tools/llvm-ar/mri-addlib.test
+++ b/llvm/test/tools/llvm-ar/mri-addlib.test
@@ -22,7 +22,7 @@
# RUN: not llvm-ar -M < %t/badlib.mri 2>&1 | FileCheck --check-prefix=PARSE %s
# RUN: not ls %t/badlib.a
-# PARSE: Could not parse library
+# PARSE: error: could not parse library
## No create command.
# RUN: echo "ADDLIB %t/f.a" > %t/nocreate.mri
diff --git a/llvm/test/tools/llvm-ar/print.test b/llvm/test/tools/llvm-ar/print.test
index 4081a36ac4e..ec7fdc4137d 100644
--- a/llvm/test/tools/llvm-ar/print.test
+++ b/llvm/test/tools/llvm-ar/print.test
@@ -69,13 +69,13 @@ RUN: | FileCheck %s --check-prefix=SAME -DFILE=%t/2.txt
RUN: not llvm-ar p 2>&1 \
RUN: | FileCheck %s --check-prefix=NO-ARCHIVE
-NO-ARCHIVE: error: An archive name must be specified.
+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]]': {{[nN]}}o such file or directory.
+MISSING-ARCHIVE: error: error loading '[[ARCHIVE]]': {{[nN]}}o such file or directory
# Member does not exist:
RUN: not llvm-ar p %t/archive.a %t-missing.txt 2>&1 \
diff --git a/llvm/test/tools/llvm-ar/quick-append.test b/llvm/test/tools/llvm-ar/quick-append.test
index 607ba413ae0..857b01a7aa1 100644
--- a/llvm/test/tools/llvm-ar/quick-append.test
+++ b/llvm/test/tools/llvm-ar/quick-append.test
@@ -54,13 +54,13 @@
# RUN: not llvm-ar qc 2>&1 \
# RUN: | FileCheck %s --check-prefix=NO-ARCHIVE
-# NO-ARCHIVE: error: An archive name must be specified.
+# 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]]: {{[nN]}}o such file or directory.
+# MISSING-FILE: error: [[FILE]]: {{[nN]}}o such file or directory
--- !ELF
FileHeader:
diff --git a/llvm/test/tools/llvm-ar/read-only-archive.test b/llvm/test/tools/llvm-ar/read-only-archive.test
index 1d638f45cac..0365f6ad054 100644
--- a/llvm/test/tools/llvm-ar/read-only-archive.test
+++ b/llvm/test/tools/llvm-ar/read-only-archive.test
@@ -13,7 +13,7 @@
# 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.
+# 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
@@ -21,7 +21,7 @@
# 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.
+# 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 {{.}}
diff --git a/llvm/test/tools/llvm-ar/replace.test b/llvm/test/tools/llvm-ar/replace.test
index 0c1722a23ef..9e38d5a7502 100644
--- a/llvm/test/tools/llvm-ar/replace.test
+++ b/llvm/test/tools/llvm-ar/replace.test
@@ -84,14 +84,14 @@
# RUN: not llvm-ar r 2>&1 \
# RUN: | FileCheck %s --check-prefix=NO-ARCHIVE
-# NO-ARCHIVE: error: An archive name must be specified.
+# 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 r %t/missing.a %t/missing.txt 2>&1 \
# RUN: | FileCheck %s --check-prefix=MISSING-FILE -DFILE=%t/missing.txt
-# MISSING-FILE: error: [[FILE]]: {{[Nn]}}o such file or directory.
+# MISSING-FILE: error: [[FILE]]: {{[Nn]}}o such file or directory
--- !ELF
FileHeader:
OpenPOWER on IntegriCloud