X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=test%2Fparser%2FMakefile.am;h=283b284a621c84a3802f5cfefb5d9c3fcecf2e0c;hp=4319705c576163aa48da7fef0b9d18ac1f850a1c;hb=8c430d0509a2f1f5dc64de308d1c1d2668d2031b;hpb=38d7d1a97d46aacf67675038c927e579bb589310

diff --git a/test/parser/Makefile.am b/test/parser/Makefile.am
index 4319705..283b284 100644
--- a/test/parser/Makefile.am
+++ b/test/parser/Makefile.am
@@ -28,17 +28,54 @@ LDADD = $(top_builddir)/lib/libpbcore.la libtest.ro
 TESTS = \
 	test-null \
 	test-grub2-single \
+	test-grub2-default \
+	test-grub2-empty \
+	test-grub2-default-index \
+	test-grub2-default-multiword \
 	test-grub2-multiple-resolve \
+	test-grub2-multiple-id \
+	test-grub2-single-line-if \
+	test-grub2-load-env \
+	test-grub2-save-env \
+	test-grub2-saved-default \
+	test-grub2-nondefault-prefix \
 	test-grub2-f18-ppc64 \
+	test-grub2-f20-ppc64 \
 	test-grub2-ubuntu-13_04-x86 \
+	test-grub2-lexer-error \
+	test-grub2-parser-error \
 	test-kboot-single \
+	test-yaboot-empty \
 	test-yaboot-single \
+	test-yaboot-partition \
+	test-yaboot-partition-override \
 	test-yaboot-external \
 	test-yaboot-root-global \
 	test-yaboot-root-override \
+	test-yaboot-device-override \
+	test-yaboot-global-state \
+	test-yaboot-leftovers \
+	test-yaboot-default \
 	test-yaboot-rh8-ppc64 \
+	test-pxe-empty \
 	test-pxe-single \
-	test-pxe-initrd-in-append
+	test-pxe-initrd-in-append \
+	test-pxe-mac-without-conf \
+	test-pxe-ip-without-conf \
+	test-pxe-non-url-conf \
+	test-pxe-local \
+	test-pxe-pathprefix-with-conf \
+	test-pxe-non-url-pathprefix-with-conf \
+	test-pxe-pathprefix-discover \
+	test-pxe-pathprefix-discover-mac \
+	test-pxe-path-resolve-relative \
+	test-pxe-path-resolve-absolute \
+	test-pxe-discover-bootfile-root \
+	test-pxe-discover-bootfile-subdir \
+	test-pxe-discover-bootfile-pathprefix \
+	test-pxe-discover-bootfile-relative-conffile \
+	test-pxe-discover-bootfile-absolute-conffile \
+	test-unresolved-remove
 
 $(TESTS): %: %.embedded-config.o
 $(TESTS): LDADD += $@.embedded-config.o
@@ -52,12 +89,14 @@ extract_config = $(srcdir)/extract-config.awk
 parser_objs = \
 	$(top_srcdir)/discover/yaboot-parser.c \
 	$(top_srcdir)/discover/kboot-parser.c \
-	$(top_srcdir)/discover/grub2-parser.c \
 	$(top_srcdir)/discover/pxe-parser.c \
+	$(top_srcdir)/discover/platform.c \
 	$(top_srcdir)/discover/resource.c \
 	$(top_srcdir)/discover/paths.c \
 	$(top_srcdir)/discover/device-handler.c \
-	$(top_srcdir)/discover/parser-conf.c
+	$(top_srcdir)/discover/parser-conf.c \
+	$(top_srcdir)/discover/user-event.c \
+	$(top_srcdir)/discover/event.c
 
 libtest_ro_SOURCES = \
 	main.c \
@@ -66,13 +105,17 @@ libtest_ro_SOURCES = \
 	parser-test.h \
 	$(parser_objs)
 
-libtest.ro$(EXEEXT): $(libtest_ro_OBJECTS)
+libtest_ro_LDADD = \
+	../../discover/grub2/grub2-parser.ro
+
+libtest.ro$(EXEEXT): $(libtest_ro_OBJECTS) $(libtest_ro_LDADD)
 	$(LD) -o $@ -r $^
 
 check_PROGRAMS = $(TESTS) libtest.ro
 
 check_DATA = \
 	data/grub2-f18-ppc64.conf \
+	data/grub2-f20-ppc.conf \
 	data/grub2-ubuntu-13_04-x86.conf \
 	data/yaboot-rh8-ppc64.conf