test/parser: Allow tests to provide pre-loaded config data

[petitboot] / test / parser / Makefile.am

diff --git a/test/parser/Makefile.am b/test/parser/Makefile.am
index d90c368103299ad7676daaf7ba0f3d4253622f6a..aa4591f9f2d707305e4b4f9e7e2e03c980d4de19 100644 (file)
--- a/test/parser/Makefile.am
+++ b/test/parser/Makefile.am
@@ -11,72 +11,41 @@
 #  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)
+       -I$(top_srcdir)/discover \
+       -DLOCAL_STATE_DIR='"$(localstatedir)"' \
+       -DTEST_CONF_BASE='"$(srcdir)/data"' \
+       -DDEBUG -DPETITBOOT_TEST
 
-AM_CFLAGS = \
-       $(DEFAULT_CFLAGS)
 
-common_libs = \
-       $(top_builddir)/lib/libpbcore.la \
-       $(top_builddir)/discover/libparser.la
+AM_CFLAGS = -O0 -ggdb -Wall -Wextra -Werror
 
-noinst_PROGRAMS = parser-test
+TESTS = test-null
 
-parser_test_SOURCES = parser-test.c
-parser_test_LDADD = $(common_libs)
+check_PROGRAMS = $(TESTS)
+check_LIBRARIES = $(test_libs)
+check_DATA =
 
-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
+common_libs = $(top_builddir)/lib/libpbcore.la
+test_libs = libtest.o
 
-composed_noinst_scripts = \
-       run-parser-tests
+libtest.o: $(libtest_o_OBJECTS)
+       $(LD) -o $@ -r $^
 
-noinst_SCRIPTS = $(composed_noinst_scripts)
+# objects under test
+parser_test_objs = $(top_srcdir)/discover/resource.c \
+                  $(top_srcdir)/discover/paths.c \
+                  $(top_srcdir)/discover/device-handler.c \
+                  $(top_srcdir)/discover/parser-conf.c
 
-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 $@
+LDADD = $(common_libs) $(test_libs)
 
-composed_files = $(composed_noinst_scripts)
+libtest_o_SOURCES = utils.c parser-test.h handler.c main.c $(parser_test_objs)
 
-EXTRA_DIST = $(addsuffix .in, $(composed_files)) $(noinst_DATA)
 
-MAINTAINERCLEANFILES = Makefile.in
-
-CLEANFILES = $(composed_files) $(addsuffix .tmp, $(composed_files))
+EXTRA_DIST = $(check_DATA)