X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=test%2Fparser%2FMakefile.am;h=eff3ece474ec5bba3aab029114f8dd8fc5efbf01;hp=7360926056bfd3c36feca4bb07394cd64fb3a042;hb=daa56dcba2d7510666aae8d427e491acc74e8975;hpb=45e92aa32a80fdbbf5ad3ad64e34b1ac872018ef

diff --git a/test/parser/Makefile.am b/test/parser/Makefile.am
index 7360926..eff3ece 100644
--- a/test/parser/Makefile.am
+++ b/test/parser/Makefile.am
@@ -11,72 +11,53 @@
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+AUTOMAKE_OPTIONS = parallel-tests
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/lib \
-	-I$(includedir) \
-	$(DEFAULT_CPPFLAGS)
-
-AM_CFLAGS = \
-	$(DEFAULT_CFLAGS)
-
-common_libs = \
-	$(top_builddir)/lib/libpbcore.la \
-	$(top_builddir)/discover/libparser.o
-
-noinst_PROGRAMS = parser-test
-
-parser_test_SOURCES = parser-test.c
-parser_test_LDADD = $(common_libs)
-
-noinst_DATA = \
-	data/grub-01/grub.cfg \
-	data/grub-02/grub.cfg \
-	data/kboot-01/expected-output \
-	data/kboot-01/etc/kboot.conf \
-	data/kboot-02/expected-output \
-	data/kboot-02/etc/kboot.conf \
-	data/kboot-03/expected-output \
-	data/kboot-03/etc/kboot.conf \
-	data/kboot-04/expected-output \
-	data/kboot-04/etc/kboot.conf \
-	data/kboot-05/expected-output \
-	data/kboot-05/etc/kboot.conf \
-	data/kboot-06/expected-output \
-	data/kboot-06/etc/kboot.conf \
-	data/kboot-07/etc/kboot.conf \
-	data/yaboot-01/expected-output \
-	data/yaboot-01/etc/yaboot.conf \
-	data/yaboot-02/etc/yaboot.conf \
-	data/yaboot-03/etc/yaboot.conf \
-	data/yaboot-04/etc/yaboot.conf \
-	data/yaboot-05/etc/yaboot.conf \
-	data/yaboot-06/etc/yaboot.conf
-
-composed_noinst_scripts = \
-	run-parser-tests
-
-noinst_SCRIPTS = $(composed_noinst_scripts)
-
-edit = sed \
-	-e 's|@PACKAGE_NAME\@|$(PACKAGE_NAME)|g' \
-	-e 's|@PACKAGE_VERSION\@|$(PACKAGE_VERSION)|g' \
-	-e 's|@PACKAGE_BUGREPORT\@|$(PACKAGE_BUGREPORT)|g' \
-	-e 's|@abs_srcdir\@|$(abs_srcdir)|g' \
-	-e 's|@abs_builddir\@|$(abs_builddir)|g' \
-	-e 's|@prefix\@|$(prefix)|g'
-
-run-parser-tests: Makefile $(srcdir)/run-parser-tests.in
-	rm -f $@ $@.tmp
-	$(edit) $(srcdir)/$@.in >$@.tmp
-	chmod +x $@.tmp
-	mv $@.tmp $@
-
-composed_files = $(composed_noinst_scripts)
-
-EXTRA_DIST = $(addsuffix .in, $(composed_files)) $(noinst_DATA)
-
-MAINTAINERCLEANFILES = Makefile.in
-
-CLEANFILES = $(composed_files) $(addsuffix .tmp, $(composed_files))
+	-I$(top_srcdir)/discover \
+	-DLOCAL_STATE_DIR='"$(localstatedir)"' \
+	-DTEST_CONF_BASE='"$(srcdir)/data"' \
+	-DDEBUG -DPETITBOOT_TEST
+
+
+AM_CFLAGS = -O0 -ggdb -Wall -Wextra -Werror
+
+TESTS = test-null \
+	test-yaboot-single
+
+check_PROGRAMS = $(TESTS)
+check_LIBRARIES = $(test_libs)
+check_DATA =
+
+common_libs = $(top_builddir)/lib/libpbcore.la
+test_libs = libtest.o
+
+libtest.o: $(libtest_o_OBJECTS)
+	$(LD) -o $@ -r $^
+
+# objects under test
+parser_test_objs = $(top_srcdir)/discover/yaboot-parser.c \
+		   $(top_srcdir)/discover/resource.c \
+		   $(top_srcdir)/discover/paths.c \
+		   $(top_srcdir)/discover/device-handler.c \
+		   $(top_srcdir)/discover/parser-conf.c
+
+
+LDADD = $(common_libs) $(test_libs)
+
+libtest_o_SOURCES = utils.c parser-test.h handler.c main.c $(parser_test_objs)
+
+$(check_PROGRAMS): %: %.embedded-config.o
+$(check_PROGRAMS): LDADD += $@.embedded-config.o
+
+extract_config = $(srcdir)/extract-config.awk
+
+%.embedded-config.c: %.c $(extract_config)
+	gawk --file=$(extract_config) $^ > $@
+
+EXTRA_DIST = $(check_DATA) $(extract_config)
+
+CLEANFILES = $(foreach f, $(check_PROGRAMS), \
+		$(f).embedded-config.c $(f).embedded-config.o)