[llvm] 1894c89 - [llvm-readobj][test] Improve grouped option test

[Fangrui Song via llvm-commits]

Author: Fangrui Song
Date: 2021-07-06T23:02:33-07:00
New Revision: 1894c8938979915ee12217f9b7da00ecb53d2ed3

URL: https://github.com/llvm/llvm-project/commit/1894c8938979915ee12217f9b7da00ecb53d2ed3
DIFF: https://github.com/llvm/llvm-project/commit/1894c8938979915ee12217f9b7da00ecb53d2ed3.diff

LOG: [llvm-readobj][test] Improve grouped option test

Added: 
    llvm/test/tools/llvm-readobj/ELF/grouped.test

Modified: 
    

Removed: 
    llvm/test/tools/llvm-readobj/ELF/merged.test


################################################################################
diff  --git a/llvm/test/tools/llvm-readobj/ELF/merged.test b/llvm/test/tools/llvm-readobj/ELF/grouped.test
similarity index 73%
rename from llvm/test/tools/llvm-readobj/ELF/merged.test
rename to llvm/test/tools/llvm-readobj/ELF/grouped.test
index c3df02691f610..e8bec71b9c541 100644
--- a/llvm/test/tools/llvm-readobj/ELF/merged.test
+++ b/llvm/test/tools/llvm-readobj/ELF/grouped.test
@@ -1,24 +1,24 @@
-## In this test we check that short command line options can be merged.
+## In this test we check that short command line options can be grouped.
 
-## Check merged args produce identical output to when not merged.
+## Check grouped options produce identical output to when not grouped.
 # RUN: yaml2obj %s -o %t.o
-# RUN: llvm-readelf -aeWhSrnudlVgIs %t.o > %t.merged
-# RUN: llvm-readelf -a -e -W -h -S -r -n -u -d -l -V -g -I -s %t.o > %t.not-merged
-# RUN: cmp %t.merged %t.not-merged
-# RUN: FileCheck %s --input-file %t.merged
+# RUN: llvm-readelf -aeWhSrnudlVgIs %t.o > %t.grouped
+# RUN: llvm-readelf -a -e -W -h -S -r -n -u -d -l -V -g -I -s %t.o > %t.not-grouped
+# RUN: cmp %t.grouped %t.not-grouped
+# RUN: FileCheck /dev/null --input-file %t.grouped --implicit-check-not=error:
 
 ## Check that the output without -a (--all) option is the same. We do it
 ## to verify that each of the options is handled, and not just the first
 ## one nor just -a, which triggers all other options.
-# RUN: llvm-readelf -eWhSrnudlVgIs %t.o > %t.merged.no.a
-# RUN: cmp %t.merged %t.merged.no.a
+# RUN: llvm-readelf -eWhSrnudlVgIs %t.o > %t.grouped.no.a
+# RUN: cmp %t.grouped %t.grouped.no.a
 
 ## -e (--headers) is equivalent to setting --file-headers (-h),
 ## --program-headers (-l) and --section-headers (-S).
 ## Check that the output without -e is equal to the output with it.
 ## We do not use -a in this test either.
-# RUN: llvm-readelf -WhSrnudlVgIs %t.o > %t.merged.no.ae
-# RUN: cmp %t.merged %t.merged.no.ae
+# RUN: llvm-readelf -WhSrnudlVgIs %t.o > %t.grouped.no.ae
+# RUN: cmp %t.grouped %t.grouped.no.ae
 
 ## An arbitrary YAML description that triggers an output for each of
 ## the short option from the test sequence.
@@ -49,10 +49,9 @@ DynamicSymbols:
   - Name:    foo
     Binding: STB_GLOBAL
 
-## llvm-readobj does not support merged args, because it also supports some old
-## flags (-st, -sd, etc.), and it would be confusing if only some merged args
+## llvm-readobj does not support grouped options, because it also supports some old
+## flags (-st, -sd, etc.), and it would be confusing if only some grouped options
 ## were supported.
 # RUN: not llvm-readobj -aeWhSsrnudlVgIS %t.o 2>&1 | FileCheck %s --check-prefix=UNKNOWN
 
-# CHECK-NOT: Unknown command line argument
 # UNKNOWN:   for the --section-headers option: may only occur zero or one times!