Consolidated {fix,get}-gnustack.c

5 files changed, 73 insertions, 6 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1ac6e14..6ac6da6 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -17,14 +17,17 @@ test.sh:
 	@echo "================================================================================"
 	@echo
 	@echo "Good Elf"
-	@../get-gnustack good
+	@../src/fix-gnustack good
 	@echo
 	@echo "Bad Elf"
-	@../get-gnustack bad
+	@../src/fix-gnustack bad
 	@echo
 	@echo "Fixing Bad Elf"
-	@../fix-gnustack bad
-	@../get-gnustack bad
+	@../src/fix-gnustack -f bad
+	@echo
+	@echo "Fixed Bad Elf"
+	@../src/fix-gnustack bad
+	@rm -f good bad
 	@echo
 	@echo "================================================================================"
 
diff --git a/tests/bad.c b/tests/bad.c
index 7999e35..74105ed 100644
--- a/tests/bad.c
+++ b/tests/bad.c
@@ -1,7 +1,21 @@
+/*
+	bad.c: C source for sample elf with X on GNU_STACK
+	Copyright (C) 2011  Anthony G. Basile
 
-#include <stdlib.h>
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
 
-//extern int badness();
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include <stdlib.h>
 
 int main()
 {
diff --git a/tests/good.c b/tests/good.c
index 196d2fc..ff7700e 100644
--- a/tests/good.c
+++ b/tests/good.c
@@ -1,3 +1,21 @@
+/*
+	good.c: C source for sample elf with no X on GNU_STACK
+	Copyright (C) 2011  Anthony G. Basile
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 int main()
 {
 	;
diff --git a/tests/test-bad32.asm b/tests/test-bad32.asm
index 1bf8607..df8296c 100644
--- a/tests/test-bad32.asm
+++ b/tests/test-bad32.asm
@@ -1,3 +1,19 @@
+;test-bad32.asm: 32-bit asm source for sample elf with X on GNU_STACK
+;Copyright (C) 2011  Anthony G. Basile
+;
+;This program is free software: you can redistribute it and/or modify
+;it under the terms of the GNU General Public License as published by
+;the Free Software Foundation, either version 3 of the License, or
+;(at your option) any later version.
+;
+;This program is distributed in the hope that it will be useful,
+;but WITHOUT ANY WARRANTY; without even the implied warranty of
+;MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;GNU General Public License for more details.
+;
+;You should have received a copy of the GNU General Public License
+;along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 global badness
 
 SECTION .text
diff --git a/tests/test-bad64.asm b/tests/test-bad64.asm
index e01531d..3a8af73 100644
--- a/tests/test-bad64.asm
+++ b/tests/test-bad64.asm
@@ -1,3 +1,19 @@
+;test-bad64.asm: 64-bit asm source for sample elf with X on GNU_STACK
+;Copyright (C) 2011  Anthony G. Basile
+;
+;This program is free software: you can redistribute it and/or modify
+;it under the terms of the GNU General Public License as published by
+;the Free Software Foundation, either version 3 of the License, or
+;(at your option) any later version.
+;
+;This program is distributed in the hope that it will be useful,
+;but WITHOUT ANY WARRANTY; without even the implied warranty of
+;MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;GNU General Public License for more details.
+;
+;You should have received a copy of the GNU General Public License
+;along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 global badness
 
 SECTION .text