From b0720b4988f9f52a5808d9c962678e473797cb16 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Tue, 12 Nov 2013 18:44:58 +0100 Subject: [PATCH] * grub-core/Makefile.core.def (legacy_password_test): Disable on platforms where no legacycfg is compiled. * grub-core/tests/lib/functional_test.c: Tolerate failure to load legacy_password_test. --- ChangeLog | 7 +++++++ grub-core/Makefile.core.def | 5 +++++ grub-core/tests/lib/functional_test.c | 3 ++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bd723d3f8..e6484716a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2013-11-12 Vladimir Serbinenko + + * grub-core/Makefile.core.def (legacy_password_test): Disable + on platforms where no legacycfg is compiled. + * grub-core/tests/lib/functional_test.c: Tolerate failure to + load legacy_password_test. + 2013-11-12 Vladimir Serbinenko * grub-core/loader/i386/bsd.c: Remove variable length arrays. diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def index 455db2559..611451938 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -1929,6 +1929,11 @@ module = { module = { name = legacy_password_test; common = tests/legacy_password_test.c; + enable = i386_pc; + enable = i386_efi; + enable = x86_64_efi; + enable = emu; + enable = xen; }; module = { diff --git a/grub-core/tests/lib/functional_test.c b/grub-core/tests/lib/functional_test.c index 07b942e2d..b99cb5f68 100644 --- a/grub-core/tests/lib/functional_test.c +++ b/grub-core/tests/lib/functional_test.c @@ -53,6 +53,8 @@ grub_functional_all_tests (grub_extcmd_context_t ctxt __attribute__ ((unused)), grub_test_t test; int ok = 1; + grub_dl_load ("legacy_password_test"); + grub_errno = GRUB_ERR_NONE; grub_dl_load ("exfctest"); grub_dl_load ("videotest_checksum"); grub_dl_load ("gfxterm_menu"); @@ -61,7 +63,6 @@ grub_functional_all_tests (grub_extcmd_context_t ctxt __attribute__ ((unused)), grub_dl_load ("div_test"); grub_dl_load ("xnu_uuid_test"); grub_dl_load ("pbkdf2_test"); - grub_dl_load ("legacy_password_test"); grub_dl_load ("signature_test"); FOR_LIST_ELEMENTS (test, grub_test_list)