diff options
| author | Owen Reynolds <gbreynoo@gmail.com> | 2019-09-19 11:22:59 +0000 |
|---|---|---|
| committer | Owen Reynolds <gbreynoo@gmail.com> | 2019-09-19 11:22:59 +0000 |
| commit | aa03c14827fab3caba6306fc2e5d7f1757230f73 (patch) | |
| tree | 8f1cbbbdbaae9e191ec3611061f75c8a0cbfa511 /llvm/test/tools/llvm-ar | |
| parent | cce2342d4691ab34915025b9959c3f12589dce51 (diff) | |
| download | bcm5719-llvm-aa03c14827fab3caba6306fc2e5d7f1757230f73.tar.gz bcm5719-llvm-aa03c14827fab3caba6306fc2e5d7f1757230f73.zip | |
Revert [llvm-ar] Include a line number when failing to parse an MRI script
Revert r372309 due to buildbot failures
Differential Revision: https://reviews.llvm.org/D67449
llvm-svn: 372311
Diffstat (limited to 'llvm/test/tools/llvm-ar')
| -rw-r--r-- | llvm/test/tools/llvm-ar/mri-addlib.test | 4 | ||||
| -rw-r--r-- | llvm/test/tools/llvm-ar/mri-errors.test | 41 |
2 files changed, 2 insertions, 43 deletions
diff --git a/llvm/test/tools/llvm-ar/mri-addlib.test b/llvm/test/tools/llvm-ar/mri-addlib.test index ee692ea9fbd..b213fd9e5c1 100644 --- a/llvm/test/tools/llvm-ar/mri-addlib.test +++ b/llvm/test/tools/llvm-ar/mri-addlib.test @@ -22,10 +22,10 @@ # RUN: not llvm-ar -M < %t/badlib.mri 2>&1 | FileCheck --check-prefix=PARSE %s # RUN: not ls %t/badlib.a -# PARSE: error: script line 2: could not parse library +# PARSE: error: could not parse library ## No create command. -# RUN: echo "ADDLIB %t/f.a" > %t/nocreate.mri +# RUN: echo "ADDLIB %t/f.a" > %t/nocreate.mri # RUN: echo "SAVE" >> %t/nocreate.mri # RUN: not llvm-ar -M < %t/nocreate.mri diff --git a/llvm/test/tools/llvm-ar/mri-errors.test b/llvm/test/tools/llvm-ar/mri-errors.test deleted file mode 100644 index a6980f27caf..00000000000 --- a/llvm/test/tools/llvm-ar/mri-errors.test +++ /dev/null @@ -1,41 +0,0 @@ -## Test different MRI comment formats and whitespace. - -# RUN: rm -rf %t && mkdir -p %t - -# RUN: echo "create %t/mri.ar" > %t/script1.mri -# RUN: echo "addlib %t/missing.a" >> %t/script1.mri - -# RUN: not llvm-ar -M < %t/script1.mri 2>&1 | FileCheck --check-prefix=SCRIPT1 %s -# SCRIPT1: error: script line 2: could not open library - -# RUN: echo "create %t/mri.ar" > %t/script2.mri -# RUN: echo "addlib %t/bad.a" >> %t/script2.mri - -# RUN: echo "bad archive" > %t/bad.a - -# RUN: not llvm-ar -M < %t/script2.mri 2>&1 | FileCheck --check-prefix=SCRIPT2 %s -# SCRIPT2: error: script line 2: could not parse library - -# RUN: echo "create %t/mri.ar" > %t/script3.mri -# RUN: echo "create %t/second.ar" >> %t/script3.mri - -# RUN: not llvm-ar -M < %t/script3.mri 2>&1 | FileCheck --check-prefix=SCRIPT3 %s -# SCRIPT3: error: script line 2: editing multiple archives not supported - -# RUN: echo "save" > %t/script4.mri -# RUN: echo "create %t/mri.ar" >> %t/script4.mri - -# RUN: not llvm-ar -M < %t/script4.mri 2>&1 | FileCheck --check-prefix=SCRIPT4 %s -# SCRIPT4: error: script line 2: file already saved - -# RUN: echo "create %t/mri.ar" > %t/script5.mri -# RUN: echo "bad command" >> %t/script5.mri - -# RUN: not llvm-ar -M < %t/script5.mri 2>&1 | FileCheck --check-prefix=SCRIPT5 %s -# SCRIPT5: error: script line 2: unknown command: bad - -# RUN: echo "bad command" | not llvm-ar -M 2>&1 | FileCheck --check-prefix=SCRIPT6 %s -# SCRIPT6: error: script line 1: unknown command: bad - -# RUN: not llvm-ar -M rc %t/mri.ar 2>&1 | FileCheck --check-prefix=SCRIPT7 %s -# SCRIPT7: error: cannot mix -M and other options |
