diff options
| author | Jan Kratochvil <jan.kratochvil@redhat.com> | 2012-10-28 13:24:27 +0100 |
|---|---|---|
| committer | Jan Kratochvil <jan.kratochvil@redhat.com> | 2012-10-28 13:24:27 +0100 |
| commit | 662a3eba0a369bb8eaa7ceb895c71c3dd1cf5fba (patch) | |
| tree | 7e5c46882e5698451b7cb66c0bdd4ec8e5abd3d2 | |
| parent | 716c679dabc348ccc28e77e14c33c33be75368a9 (diff) | |
| parent | acb297e023b68ec27ef697e19efb74981a736436 (diff) | |
| download | elfutils-662a3eba0a369bb8eaa7ceb895c71c3dd1cf5fba.tar.gz | |
Merge branch 'jankratochvil/basecleanup-basealign' into jankratochvil/basecleanup-basealign-baseaddr
Conflicts:
tests/run-dwfl-report-elf-align.sh
| -rwxr-xr-x | tests/run-dwfl-report-elf-align.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/run-dwfl-report-elf-align.sh b/tests/run-dwfl-report-elf-align.sh index df2c583e..4c4c3e65 100755 --- a/tests/run-dwfl-report-elf-align.sh +++ b/tests/run-dwfl-report-elf-align.sh @@ -28,7 +28,7 @@ testfiles testfile-dwfl-report-elf-align-shlib.so # LOAD 0x000660 0x0000000000200660 0x0000000000200660 0x0001f0 0x000200 RW 0x200000 # #1 0x00007f3560c92585 in shlib () from ./testfile-dwfl-report-elf-align-shlib.so -./dwfl-report-elf-align ./testfile-dwfl-report-elf-align-shlib.so \ - 0x7f3560c92000 0x7f3560c92585 shlib +testrun ./dwfl-report-elf-align ./testfile-dwfl-report-elf-align-shlib.so \ + 0x7f3560c92000 0x7f3560c92585 shlib exit 0 |