* 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.

diff --git a/ChangeLog b/ChangeLog
index bd723d3f80f71b59cd5e0b4c5dc3c937e946e96b..e6484716aecd470e6246836f96c45579d3cacff3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-11-12  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * 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  <phcoder@gmail.com>
 
        * 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 455db2559d41027be1d5d7db6ebd006e2f39fed8..611451938e04633d19f4cb1bb7d55dc83af14bae 100644 (file)
--- 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 07b942e2d736c755704e3a56c362b6b433eec15b..b99cb5f68769ff43b23f9e2c753a227670e8fcdc 100644 (file)
--- 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)