[llvm-objcopy] - Stop using Inputs/alloc-symtab.o.

[grimar]

Summary

Initially Inputs/alloc-symtab.o was added in D42222.
It contains an allocatable .symtab section. Today
we are able to create such sections using yaml2obj.

Later people started using this input for no solid reason in their tests.
Now multiple of tests are using it.
(And those tests do not need such a specific case actually).

In this patch I removed this binary and rewrote the few tests.

[MaskRay]

test/tools/llvm-objcopy/ELF/binary-out-error.test

2 ↗

(On Diff #211733)

not llvm-objcopy -O binary %t - 2>&1 | FileCheck %s --check-prefix=SYMTAB

test/tools/llvm-objcopy/ELF/invalid-preserve-dates.test

18 ↗

(On Diff #211733)

Testing N args.

Can you improve the comment?

[jhenderson]

test/tools/llvm-objcopy/ELF/binary-out-error.test

2 ↗

(On Diff #211733)

You can actually get rid of the --check-prefix entirely, since this is the only check in the file.

[MaskRay]

test/tools/llvm-objcopy/ELF/binary-out-error.test

2 ↗

(On Diff #211733)

Some other "out to binary" warnings have not been tested. We can add them later, so --check-prefix=SYMTAB can be kept to make future diff smaller.

[grimar]

• Addressed review comments.

test/tools/llvm-objcopy/ELF/binary-out-error.test

2 ↗

(On Diff #211733)

Some other "out to binary" warnings have not been tested. We can add them later, so --check-prefix=SYMTAB can be kept to make future diff smaller.

Yep, below is a list of candidates for testing:

void BinarySectionWriter::visit(const SectionIndexSection &Sec) {
  error("cannot write symbol section index table '" + Sec.Name + "' ");
}

void BinarySectionWriter::visit(const SymbolTableSection &Sec) {
  error("cannot write symbol table '" + Sec.Name + "' out to binary");
}

void BinarySectionWriter::visit(const RelocationSection &Sec) {
  error("cannot write relocation section '" + Sec.Name + "' out to binary");
}

void BinarySectionWriter::visit(const GnuDebugLinkSection &Sec) {
  error("cannot write '" + Sec.Name + "' out to binary");
}

void BinarySectionWriter::visit(const GroupSection &Sec) {
  error("cannot write '" + Sec.Name + "' out to binary");
}

[jhenderson]

LGTM.

llvm/trunk/test/tools/llvm-objcopy/ELF/binary-out-error.test

-# RUN: not llvm-objcopy -O binary %p/Inputs/alloc-symtab.o %t2 2>&1 >/dev/null | FileCheck %s --check-prefix=SYMTAB
+# RUN: yaml2obj %s -o %t
+# RUN: not llvm-objcopy -O binary %t - 2>&1 | FileCheck %s --check-prefix=SYMTAB
 # SYMTAB: cannot write symbol table '.symtab' out to binary
+
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS64
+  Data:    ELFDATA2LSB
+  Type:    ET_DYN
+  Machine: EM_X86_64
+Sections:
+  - Name: .symtab
+    Type: SHT_SYMTAB
+    Flags: [ SHF_ALLOC ]

llvm/trunk/test/tools/llvm-objcopy/ELF/invalid-preserve-dates.test

-## This tests for an expected error when --preserve dates is
+## This tests for an expected error when --preserve-dates is
 ## specified at the same time as using stdin or stdout as input or
 ## output files.
 
+# RUN: yaml2obj %s -o %t.foo
+
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS64
+  Data:    ELFDATA2LSB
+  Type:    ET_DYN
+  Machine: EM_X86_64
+...
+
 # RUN: not llvm-objcopy --preserve-dates - %t 2>&1 | FileCheck %s
-# RUN: not llvm-objcopy --preserve-dates %p/Inputs/alloc-symtab.o - 2>&1 | FileCheck %s
+# RUN: not llvm-objcopy --preserve-dates %t.foo - 2>&1 | FileCheck %s
 
-## Testing N args.
-# RUN: not llvm-strip --preserve-dates - < %p/Inputs/alloc-symtab.o 2>&1 | FileCheck %s
-# RUN: not llvm-strip --preserve-dates %p/Inputs/alloc-symtab.o - < \
-# RUN:      %p/Inputs/alloc-symtab.o 2>&1 | FileCheck %s
-# RUN: not llvm-strip --preserve-dates - %p/Inputs/alloc-symtab.o < \
-# RUN:      %p/Inputs/alloc-symtab.o 2>&1 | FileCheck %s
-# RUN: not llvm-strip --preserve-dates %p/Inputs/alloc-symtab.o - \
-# RUN:      %p/Inputs/alloc-symtab.o < %p/Inputs/alloc-symtab.o 2>&1 | FileCheck %s
+## Test that llvm-strip reports a proper error when --preserve-dates is specified
+## with one or more inputs, where one of them is stdin.
+# RUN: not llvm-strip --preserve-dates - < %t.foo 2>&1 | FileCheck %s
+# RUN: not llvm-strip --preserve-dates %t.foo - < %t.foo 2>&1 | FileCheck %s
+# RUN: not llvm-strip --preserve-dates - %t.foo < %t.foo 2>&1 | FileCheck %s
+# RUN: not llvm-strip --preserve-dates %t.foo - %t.foo < %t.foo 2>&1 | FileCheck %s
 
 ## Testing -o.
-# RUN: not llvm-strip --preserve-dates - -o %p/Inputs/alloc-symtab.o < \
-# RUN:      %p/Inputs/alloc-symtab.o 2>&1 | FileCheck %s
-# RUN: not llvm-strip --preserve-dates %p/Inputs/alloc-symtab.o -o - < \
-# RUN:      %p/Inputs/alloc-symtab.o 2>&1 | FileCheck %s
+# RUN: not llvm-strip --preserve-dates - -o %t.foo < %t.foo 2>&1 | FileCheck %s
+# RUN: not llvm-strip --preserve-dates %t.foo -o - < %t.foo 2>&1 | FileCheck %s
 
 # CHECK: error: --preserve-dates requires a file

llvm/trunk/test/tools/llvm-objcopy/ELF/standard-streams.test

-# RUN: llvm-objcopy - %t < %p/Inputs/alloc-symtab.o
-# RUN: llvm-objcopy %p/Inputs/alloc-symtab.o %t1
+# RUN: yaml2obj %s -o %t.foo
+
+# RUN: llvm-objcopy - %t < %t.foo
+# RUN: llvm-objcopy %t.foo %t1
 # RUN: cmp %t %t1
 
-# RUN: llvm-objcopy %p/Inputs/alloc-symtab.o - > %t2
+# RUN: llvm-objcopy %t.foo - > %t2
 # RUN: cmp %t1 %t2
+
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS64
+  Data:    ELFDATA2LSB
+  Type:    ET_DYN
+  Machine: EM_X86_64

llvm/trunk/test/tools/llvm-objcopy/ELF/strict-no-add.test

 # This test makes sure that sections added at the end that don't have symbols
 # defined in them don't trigger the creation of a large index table.
 
 RUN: %python %p/../Inputs/ungzip.py %p/Inputs/many-sections.o.gz > %t.0
-RUN: cat %p/Inputs/alloc-symtab.o > %t
+RUN: echo 'foo' > %t
 RUN: llvm-objcopy -R .text -R s0 -R s1 -R s2 -R s3 -R s4 -R s5 -R s6 %t.0 %t2
 RUN: llvm-objcopy --add-section=.s0=%t --add-section=.s1=%t --add-section=.s2=%t %t2 %t2
 RUN: llvm-readobj --sections %t2 | FileCheck --check-prefix=SECS %s
 
 SECS-NOT: Name: .symtab_shndx