From 9e364e5fcaa7eda3bd140104b41bed1565d1e2e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 10 Aug 2021 14:03:24 +0200
Subject: [PATCH 1/3] tests/contiguous-note-sections: rename for consistency

---
 tests/Makefile.am                                         | 8 ++++----
 ...guous_note_sections.ld => contiguous-note-sections.ld} | 0
 ...tiguous_note_sections.s => contiguous-note-sections.s} | 0
 ...guous_note_sections.sh => contiguous-note-sections.sh} | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename tests/{contiguous_note_sections.ld => contiguous-note-sections.ld} (100%)
 rename tests/{contiguous_note_sections.s => contiguous-note-sections.s} (100%)
 rename tests/{contiguous_note_sections.sh => contiguous-note-sections.sh} (93%)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 23a7098e..91a28ae8 100644
--- a/tests/Makefile.am
+++ b/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_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
diff --git a/tests/contiguous_note_sections.ld b/tests/contiguous-note-sections.ld
similarity index 100%
rename from tests/contiguous_note_sections.ld
rename to tests/contiguous-note-sections.ld
diff --git a/tests/contiguous_note_sections.s b/tests/contiguous-note-sections.s
similarity index 100%
rename from tests/contiguous_note_sections.s
rename to tests/contiguous-note-sections.s
diff --git a/tests/contiguous_note_sections.sh b/tests/contiguous-note-sections.sh
similarity index 93%
rename from tests/contiguous_note_sections.sh
rename to tests/contiguous-note-sections.sh
index 8bc8f3ce..07c9354c 100755
--- a/tests/contiguous_note_sections.sh
+++ b/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

From 989d0ba4ddaf6e7b7533626d3453b06d5097d3f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 10 Aug 2021 14:03:42 +0200
Subject: [PATCH 2/3] gitignore: add all test binaries

---
 .gitignore | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitignore b/.gitignore
index f14eed72..ef4abeb4 100644
--- a/.gitignore
+++ b/.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

From 2982586b7c41a0244cc78643eee0ee3beac41d79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 10 Aug 2021 14:04:07 +0200
Subject: [PATCH 3/3] release: autoreconfHook

This is needed when building in `nix develop`
and it is also useful to rebuild autotools
when building a package.
---
 flake.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/flake.nix b/flake.nix
index 1eb8a4d0..62951657 100644
--- a/flake.nix
+++ b/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;
         };