summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorThomas Schwinge <tschwinge@gnu.org>2007-03-04 13:45:19 +0000
committerThomas Schwinge <tschwinge@gnu.org>2009-06-18 00:27:05 +0200
commit66a421905507c34e7e5774e8277b00ff3ce621a8 (patch)
treee1253fd5ea0ef0a172d65656b3b9185f20a667ca /tests
parent4faaa2fed9a8c8f0863872d018407fa9b6c86271 (diff)
2007-03-04 Thomas Schwinge <tschwinge@gnu.org>
* tests/configfrag.ac (MBCHK): Remove check. * tests/test-mbchk.in: Fail correctly if `mbchk' is not available.
Diffstat (limited to 'tests')
-rw-r--r--tests/configfrag.ac6
-rw-r--r--tests/test-mbchk.in38
2 files changed, 23 insertions, 21 deletions
diff --git a/tests/configfrag.ac b/tests/configfrag.ac
index bb0310c1..1c00fbb2 100644
--- a/tests/configfrag.ac
+++ b/tests/configfrag.ac
@@ -17,12 +17,6 @@ dnl with this program; if not, write to the Free Software Foundation, Inc.,
dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
-# Programs.
-#
-
-AC_CHECK_PROG([MBCHK], [mbchk], [mbchk], [:])
-
-#
# Tests.
#
diff --git a/tests/test-mbchk.in b/tests/test-mbchk.in
index d4c4c285..a04a00eb 100644
--- a/tests/test-mbchk.in
+++ b/tests/test-mbchk.in
@@ -2,21 +2,29 @@
# Test if the kernel image complies with the multiboot specification.
-# Copyright (C) 2006 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2007 Free Software Foundation, 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, or (at
-# your option) any later version.
-#
+# 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, 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+# 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.
-@MBCHK@ \
- gnumach
+if mbchk --version > /dev/null 2>&1
+then mbchk gnumach
+else
+ # `mbchk' is not available -- ignore this test.
+ exit 77
+fi
+
+# Local Variables:
+# mode: shell-script
+# End: