[llvm] r367310 - [llvm-objcopy] - Stop using Inputs/alloc-symtab.o
George Rimar via llvm-commits
llvm-commits at lists.llvm.org
Tue Jul 30 06:37:02 PDT 2019
Author: grimar
Date: Tue Jul 30 06:37:02 2019
New Revision: 367310
URL: http://llvm.org/viewvc/llvm-project?rev=367310&view=rev
Log:
[llvm-objcopy] - Stop using Inputs/alloc-symtab.o
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.
Differential revision: https://reviews.llvm.org/D65278
Removed:
llvm/trunk/test/tools/llvm-objcopy/ELF/Inputs/alloc-symtab.o
Modified:
llvm/trunk/test/tools/llvm-objcopy/ELF/binary-out-error.test
llvm/trunk/test/tools/llvm-objcopy/ELF/invalid-preserve-dates.test
llvm/trunk/test/tools/llvm-objcopy/ELF/standard-streams.test
llvm/trunk/test/tools/llvm-objcopy/ELF/strict-no-add.test
Removed: llvm/trunk/test/tools/llvm-objcopy/ELF/Inputs/alloc-symtab.o
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objcopy/ELF/Inputs/alloc-symtab.o?rev=367309&view=auto
==============================================================================
Binary files llvm/trunk/test/tools/llvm-objcopy/ELF/Inputs/alloc-symtab.o (original) and llvm/trunk/test/tools/llvm-objcopy/ELF/Inputs/alloc-symtab.o (removed) differ
Modified: llvm/trunk/test/tools/llvm-objcopy/ELF/binary-out-error.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objcopy/ELF/binary-out-error.test?rev=367310&r1=367309&r2=367310&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-objcopy/ELF/binary-out-error.test (original)
+++ llvm/trunk/test/tools/llvm-objcopy/ELF/binary-out-error.test Tue Jul 30 06:37:02 2019
@@ -1,2 +1,14 @@
-# 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 ]
Modified: llvm/trunk/test/tools/llvm-objcopy/ELF/invalid-preserve-dates.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objcopy/ELF/invalid-preserve-dates.test?rev=367310&r1=367309&r2=367310&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-objcopy/ELF/invalid-preserve-dates.test (original)
+++ llvm/trunk/test/tools/llvm-objcopy/ELF/invalid-preserve-dates.test Tue Jul 30 06:37:02 2019
@@ -1,23 +1,29 @@
-## 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
Modified: llvm/trunk/test/tools/llvm-objcopy/ELF/standard-streams.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objcopy/ELF/standard-streams.test?rev=367310&r1=367309&r2=367310&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-objcopy/ELF/standard-streams.test (original)
+++ llvm/trunk/test/tools/llvm-objcopy/ELF/standard-streams.test Tue Jul 30 06:37:02 2019
@@ -1,6 +1,15 @@
-# 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
Modified: llvm/trunk/test/tools/llvm-objcopy/ELF/strict-no-add.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objcopy/ELF/strict-no-add.test?rev=367310&r1=367309&r2=367310&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-objcopy/ELF/strict-no-add.test (original)
+++ llvm/trunk/test/tools/llvm-objcopy/ELF/strict-no-add.test Tue Jul 30 06:37:02 2019
@@ -2,7 +2,7 @@
# 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
More information about the llvm-commits
mailing list