It's not our job to worry about downstream packaging issues ... --- generator/tests.ml | 1 - tests/regressions/Makefile.am | 3 +- tests/regressions/test-noexec-stack.pl | 78 ---------------------------------- tests/regressions/tests.mk | 3 +- 4 files changed, 2 insertions(+), 83 deletions(-) delete mode 100755 tests/regressions/test-noexec-stack.pl diff --git a/generator/tests.ml b/generator/tests.ml index a8c629b..fdcf57f 100644 --- a/generator/tests.ml +++ b/generator/tests.ml @@ -356,7 +356,6 @@ let tests = [ "rhbz1054761.sh"; "rhbz1091803.sh"; "rhbz1232192.sh"; - "test-noexec-stack.pl"; ]; check_slow = [ "rhbz909624.sh" diff --git a/tests/regressions/Makefile.am b/tests/regressions/Makefile.am index c33cd2c..f3f55f0 100644 --- a/tests/regressions/Makefile.am +++ b/tests/regressions/Makefile.am @@ -46,8 +46,7 @@ EXTRA_DIST = \ rhbz1091803.sh \ rhbz1175196.sh \ rhbz1232192.sh \ - rhbz1232192.xml \ - test-noexec-stack.pl + rhbz1232192.xml # There are a couple of tests that we don't run: EXTRA_DIST += \ diff --git a/tests/regressions/test-noexec-stack.pl b/tests/regressions/test-noexec-stack.pl deleted file mode 100755 index e54b1df..0000000 --- a/tests/regressions/test-noexec-stack.pl +++ /dev/null @@ -1,78 +0,0 @@ -#!/usr/bin/perl -# Copyright (C) 2009-2014 Red Hat Inc. -# -# 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 2 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, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -use strict; -use warnings; - -my @files = ( "$ENV{top_builddir}/src/.libs/libguestfs.so", - "$ENV{top_builddir}/daemon/guestfsd" ); - -FILES: foreach my $file (@files) { - my $output; - my @cmd = ('readelf', '-l', $file); - open ($output, '-|', @cmd) - or die ("$0: failed to run: '".join(' ', @cmd)."': $!\n"); - - my $offset; - my $line = 1; - - # Find the offset of the Flags field - while (<$output>) { - next unless /^\s*Type\b/; - - my @lines; - push (@lines, $_); - - # Look for a Flg field on this line (32 bit) - $offset = index ($_, 'Flg '); - - if (-1 == $offset) { - # 64 bit is split over 2 lines. Look for a Flags field on the next - # line - $_ = <$output>; - $offset = index ($_, 'Flags '); - $line = 2; - push (@lines, $_); - } - - die "Unrecognised header: ".join("\n", @lines) if -1 == $offset; - last; - } - - # Find the GNU_STACK entry - while (<$output>) { - next unless /^\s*GNU_STACK\b/; - - # Skip over input lines according to the header - for (my $i = 1; $i < $line; $i++) { - $_ = <$output>; - } - - my $flags = substr ($_, $offset, 3); - - $flags =~ /^[ R][ W]([ E])$/ or die "Unrecognised flags: $flags"; - - if ('E' eq $1) { - print "***** $file has an executable stack *****\n"; - exit 1; - } - - next FILES; - } - - die "Didn't find GNU_STACK entry"; -} diff --git a/tests/regressions/tests.mk b/tests/regressions/tests.mk index d582b91..4d9217b 100644 --- a/tests/regressions/tests.mk +++ b/tests/regressions/tests.mk @@ -46,8 +46,7 @@ localtests_SCRIPTS = \ rhbz895904.sh \ rhbz909624.sh \ rhbz957772.sh \ - rhbz975797.sh \ - test-noexec-stack.pl + rhbz975797.sh localtests_PROGRAMS = \ rhbz1055452 \ -- 2.4.3