Skip to content

Cleanups #298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 10, 2021
Merged

Cleanups #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e364e5
tests/contiguous-note-sections: rename for consistency
Mic92 Aug 10, 2021
989d0ba
gitignore: add all test binaries
Mic92 Aug 10, 2021
2982586
release: autoreconfHook
Mic92 Aug 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,9 @@ Makefile
/tests/no-rpath
/tests/no-rpath-*.sh
/tests/*.so
/tests/scratch
/tests/main
/tests/simple
/tests/too-many-strtab
/tests/big-dynstr*
/tests/main-scoped
1 change: 1 addition & 0 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
patchelf-new = final.stdenv.mkDerivation {
name = "patchelf-${self.hydraJobs.tarball.version}";
src = "${self.hydraJobs.tarball}/tarballs/*.tar.bz2";
nativeBuildInputs = [ pkgs.autoreconfHook ];
Copy link
Member

@edolstra edolstra Aug 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is autoreconfHook needed? The tarball contains the generated configure scripts right?

Copy link
Member Author

@Mic92 Mic92 Aug 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The main use case is having autotools in nix develop but it would also regenerate the configure script to a newer version

doCheck = true;
};

Expand Down
8 changes: 4 additions & 4 deletions tests/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
LIBS =

check_PROGRAMS = simple main too-many-strtab main-scoped big-dynstr no-rpath contiguous_note_sections
check_PROGRAMS = simple main too-many-strtab main-scoped big-dynstr no-rpath contiguous-note-sections

no_rpath_arch_TESTS = \
no-rpath-amd64.sh \
Expand Down Expand Up @@ -30,7 +30,7 @@ src_TESTS = \
build-id.sh \
invalid-elf.sh \
endianness.sh \
contiguous_note_sections.sh \
contiguous-note-sections.sh \
no-gnu-hash.sh

build_TESTS = \
Expand Down Expand Up @@ -114,6 +114,6 @@ no_rpath_SOURCES = no-rpath.c
# no -fpic for no-rpath.o
no_rpath_CFLAGS =

contiguous_note_sections_SOURCES = contiguous_note_sections.s contiguous_note_sections.ld
contiguous_note_sections_LDFLAGS = -nostdlib -T contiguous_note_sections.ld
contiguous_note_sections_SOURCES = contiguous-note-sections.s contiguous-note-sections.ld
contiguous_note_sections_LDFLAGS = -nostdlib -T contiguous-note-sections.ld
contiguous_note_sections_CFLAGS = -pie
0 tests/contiguous_note_sections.ld → tests/contiguous-note-sections.ld
View file
Open in desktop
File renamed without changes.
0 tests/contiguous_note_sections.s → tests/contiguous-note-sections.s
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/contiguous_note_sections.sh → tests/contiguous-note-sections.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
# Running --set-interpreter on this binary should not produce the following
# error:
# patchelf: cannot normalize PT_NOTE segment: non-contiguous SHT_NOTE sections
../src/patchelf --set-interpreter ld-linux-x86-64.so.2 contiguous_note_sections
../src/patchelf --set-interpreter ld-linux-x86-64.so.2 contiguous-note-sections