diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2025-04-28 14:45:27 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2025-04-28 14:45:27 +0200 |
| commit | 4401af9bcc5dc95c0d58b3b0750e81f964b66314 (patch) | |
| tree | e55e1662471a68da59b8774d4c0dcf7aa9103d43 | |
| parent | 7d62649bd30797f85379561d2c471a10d802bbac (diff) | |
tests: make test-multiboot.in also take GNUMACH into account
| -rw-r--r-- | tests/Makefrag.am | 4 | ||||
| -rw-r--r-- | tests/test-multiboot.in | 3 | ||||
| -rw-r--r-- | tests/user-qemu.mk | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/tests/Makefrag.am b/tests/Makefrag.am index e82ef3e1..fe9c37e1 100644 --- a/tests/Makefrag.am +++ b/tests/Makefrag.am @@ -22,6 +22,10 @@ if !PLATFORM_xen +# Let user specify a kernel to test +GNUMACH ?= gnumach +export GNUMACH + .NOTPARALLEL: check include tests/user-qemu.mk diff --git a/tests/test-multiboot.in b/tests/test-multiboot.in index 20ab3309..7693ab93 100644 --- a/tests/test-multiboot.in +++ b/tests/test-multiboot.in @@ -18,8 +18,9 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +[ -n "$GNUMACH" ] || GNUMACH=gnumach if grub-file --help > /dev/null 2>&1 -then grub-file --is-x86-multiboot gnumach +then grub-file --is-x86-multiboot $GNUMACH else # `grub-file' is not available -- ignore this test. exit 77 diff --git a/tests/user-qemu.mk b/tests/user-qemu.mk index e82e74e2..e620d68d 100644 --- a/tests/user-qemu.mk +++ b/tests/user-qemu.mk @@ -14,9 +14,6 @@ # along with the program ; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# Let user specify a kernel to test -GNUMACH ?= gnumach - # # MIG stubs generation for user-space tests # |