summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--tests/configfrag.ac6
-rw-r--r--tests/test-mbchk.in38
3 files changed, 28 insertions, 21 deletions
diff --git a/ChangeLog b/ChangeLog
index efb22c8..3ba419a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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.
+
2007-03-01 Thomas Schwinge <tschwinge@gnu.org>
* linux/dev/glue/block.c (free_buffer): Use `VM_PAGE_FREE'.
diff --git a/tests/configfrag.ac b/tests/configfrag.ac
index bb0310c..1c00fbb 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 d4c4c28..a04a00e 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: