merge mainline into newreloc

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-01-30 16:46:16 +01:00
commit 6e308bd942
72 changed files with 1538 additions and 533 deletions

View file

@ -28,7 +28,7 @@ example_test (void)
/* Check if 1st argument is true and report with custom error message. */
grub_test_assert (2 == 2, "2 equal 2 expected");
grub_test_assert (2 == 3, "2 is not equal to %d", 3);
grub_test_assert (2 != 3, "2 matches %d", 3);
}
/* Register example_test method as a functional test. */

View file

@ -31,7 +31,7 @@ example_test (void)
/* Check if 1st argument is true and report with custom error message. */
grub_test_assert (2 == 2, "2 equal 2 expected");
grub_test_assert (2 == 3, "2 is not equal to %d", 3);
grub_test_assert (2 != 3, "2 matches %d", 3);
}
/* Register example_test method as a unit test. */