vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2010-01-28 Robert Millan <rmh.grub@aybabtu.com>

Browse source 
* Makefile.in (check): Exit with fail status when one of the tests
	fails.
	* tests/example_functional_test.c (example_test): Fix reversed assert.
	* tests/example_unit_test.c (example_test): Likewise.
This commit is contained in:
Robert Millan 2010-01-28 15:27:41 +00:00
parent 2e1cb9bbbf
commit ec1444e6df
4 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2010-01-28 Robert Millan <rmh.grub@aybabtu.com>
* Makefile.in (check): Exit with fail status when one of the tests
fails.
* tests/example_functional_test.c (example_test): Fix reversed assert.
* tests/example_unit_test.c (example_test): Likewise.
2010-01-28 Colin Watson <cjwatson@ubuntu.com> 2010-01-28 Colin Watson <cjwatson@ubuntu.com>
* util/grub.d/10_linux.in: This script does not use any of the * util/grub.d/10_linux.in: This script does not use any of the

10
Makefile.in
View file

@ -473,23 +473,21 @@ distcheck: dist
check: all $(UNIT_TESTS) $(FUNCTIONAL_TESTS) $(SCRIPTED_TESTS) check: all $(UNIT_TESTS) $(FUNCTIONAL_TESTS) $(SCRIPTED_TESTS)
@list="$(UNIT_TESTS)"; \ @list="$(UNIT_TESTS)"; \
set -e; \
for file in $$list; do \ for file in $$list; do \
$(builddir)/$$file; \ $(builddir)/$$file; \
done done
@list="$(FUNCTIONAL_TESTS)"; \ @list="$(FUNCTIONAL_TESTS)"; \
set -e; \
for file in $$list; do \ for file in $$list; do \
mod=`basename $$file .mod`; \ mod=`basename $$file .mod`; \
echo "insmod functional_test; insmod $$mod; functional_test" \ echo "insmod functional_test; insmod $$mod; functional_test" \
| $(builddir)/grub-shell; \ | $(builddir)/grub-shell; \
done done
@list="$(SCRIPTED_TESTS)"; \ @list="$(SCRIPTED_TESTS)"; \
set -e; \
for file in $$list; do \ for file in $$list; do \
echo "$$file:"; \ $(builddir)/$$file; \
if $(builddir)/$$file; then \
echo "$$file: PASS"; \
else \
echo "$$file: FAIL"; \
fi; \
done done
.SUFFIX: .SUFFIX:

2
tests/example_functional_test.c
View file

@ -28,7 +28,7 @@ example_test (void)
/* Check if 1st argument is true and report with custom error message. */ /* 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 == 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. */ /* Register example_test method as a functional test. */

2
tests/example_unit_test.c
View file

@ -31,7 +31,7 @@ example_test (void)
/* Check if 1st argument is true and report with custom error message. */ /* 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 == 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. */ /* Register example_test method as a unit test. */