Merge pull request #298 from NixOS/cleanups

Cleanups

.gitignore

@@ -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

flake.nix

@@ -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 ];
           doCheck = true;
         };
 

tests/Makefile.am

@@ -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 \
@@ -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 = \
@@ -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_SOURCES = contiguous-note-sections.s contiguous-note-sections.ld
-contiguous_note_sections_LDFLAGS = -nostdlib -T contiguous_note_sections.ld
+contiguous_note_sections_LDFLAGS = -nostdlib -T contiguous-note-sections.ld
 contiguous_note_sections_CFLAGS = -pie

tests/contiguous-note-sections.sh

@@ -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