From 71f4a46b3a94a406530ef000420795e49d17ebf4 Mon Sep 17 00:00:00 2001
From: John Mark Bell <jmb@netsurf-browser.org>
Date: Wed, 25 Mar 2009 20:35:48 +0000
Subject: First cut at a port to the new buildsystem. DOMTS stuff currently
 disabled.

svn path=/trunk/dom/; revision=6883
---
 test/Makefile     | 111 +++++++++++-------------------------------------------
 test/lib/Makefile |  69 ---------------------------------
 2 files changed, 23 insertions(+), 157 deletions(-)
 delete mode 100644 test/lib/Makefile

(limited to 'test')

diff --git a/test/Makefile b/test/Makefile
index 0fb57d9..b320a61 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,96 +1,31 @@
-# Makefile for DOM testcases
-#
-# Toolchain is exported by top-level makefile
-#
-# Top-level makefile also exports the following variables:
-#
-# COMPONENT  Name of component
-# EXPORT     Absolute path of export directory
-# TOP        Absolute path of source tree root
-#
-# The top-level makefile requires the following targets to exist:
-#
-# clean      Clean source tree
-# debug      Create a debug binary
-# distclean  Fully clean source tree, back to pristine condition
-# export     Export distributable components to ${EXPORT}
-# release    Create a release binary
-# setup      Perform any setup required prior to compilation
-# test       Execute any test cases
-
-# Extend toolchain settings
-CFLAGS += -I${TOP}/src/ -I${TOP}/bindings/xml/ -I${TOP}/bindings/hubbub/ \
-	-I$(CURDIR)
-LDFLAGS += `${PKGCONFIG} ${PKGCONFIGFLAGS} --libs libxml-2.0 libhubbub`
-
-# Libraries we link against
-LIBS = -L./lib -ldomtest-debug -ldom-libxml-debug \
-	-ldom-libhubbub-debug -ldom-debug
+testlib_files := lib/comparators.c;lib/list.c;lib/testassert.c;
+testlib_files := $(testlib_files);lib/testobject.c;lib/utils.c
 
-# Release output
-RELEASE =
+DIR_TEST_ITEMS := binding:binding.c;$(testlib_files) \
+		test-list:test-list.c;$(testlib_files)
 
-# Debug output
-DEBUG =
+include build/makefiles/Makefile.subdir
 
+# TODO: XML suite
+#
 # Transformer input
-XMLFILES = $(wildcard xml/tests/*.xml)
-
+#XMLFILES = $(wildcard xml/tests/*.xml)
+#
 # Transformer output
-CFILES = $(addprefix xml/c/, $(notdir $(XMLFILES:.xml=.c)))
-
+#CFILES = $(addprefix xml/c/, $(notdir $(XMLFILES:.xml=.c)))
+#
 # Objects
-XMLOBJS = $(addprefix xml/bin/, $(notdir $(XMLFILES:.xml=)))
-OTHEROBJS = binding test-list
-OBJS = $(OTHEROBJS) $(XMLOBJS)
-
-.PHONY: clean debug export release setup test transform
-
-# Targets
-release:
-	@${MAKE} -C lib release
-
-debug:
-	@${MAKE} -C lib debug
-
-clean:
-	@${MAKE} -C lib clean
-ifneq (${OBJS}, )
-	-@${RM} ${RMFLAGS} $(addsuffix ${EXEEXT}, $(OTHEROBJS))
-	-@${RM} ${RMFLAGS} -r xml/c/
-	-@${RM} ${RMFLAGS} -r xml/bin/
-endif
-
-distclean:
-	@${MAKE} -C lib distclean
-	-@${RM} ${RMFLAGS} log
-
-setup:
-	@${MAKE} -C lib setup
-	@${MKDIR} ${MKDIRFLAGS} $(CURDIR)/xml/c
-	@${MKDIR} ${MKDIRFLAGS} $(CURDIR)/xml/bin
-
-export:
-	@${MAKE} -C lib export
-
-test: release debug $(OBJS)
-	@${PERL} testrunner.pl ${EXEEXT}
-
-transform: $(CFILES)
-
+#XMLOBJS = $(addprefix xml/bin/, $(notdir $(XMLFILES:.xml=)))
+#
+#transform: $(CFILES)
+#
 # Pattern rules
-xml/bin/%: xml/c/%.c
-	@${ECHO} ${ECHOFLAGS} "==> $<"
-	@${CC} -c -g ${CFLAGS} -o $@.o $<
-	@${LD} -g -o $@ $@.o ${LDFLAGS} $(LIBS)
-	@${RM} ${RMFLAGS} $@.o
-
-xml/c/%.c: xml/tests/%.xml
-	@${XSLT} ${XSLTFLAGS} -o $@ transform/test-to-c.xsl $<
-
-%: %.c
-	@${ECHO} ${ECHOFLAGS} "==> $<"
-	@${CC} -c -g ${CFLAGS} -o $@.o $<
-	@${LD} -g -o $@ $@.o $(LIBS) ${LDFLAGS}
-	@${RM} ${RMFLAGS} $@.o
+#xml/bin/%: xml/c/%.c
+#	@${ECHO} ${ECHOFLAGS} "==> $<"
+#	@${CC} -c -g ${CFLAGS} -o $@.o $<
+#	@${LD} -g -o $@ $@.o ${LDFLAGS} $(LIBS)
+#	@${RM} ${RMFLAGS} $@.o
+#
+#xml/c/%.c: xml/tests/%.xml
+#	@${XSLT} ${XSLTFLAGS} -o $@ transform/test-to-c.xsl $<
 
diff --git a/test/lib/Makefile b/test/lib/Makefile
deleted file mode 100644
index 78e6bff..0000000
--- a/test/lib/Makefile
+++ /dev/null
@@ -1,69 +0,0 @@
-# Makefile for DOM testcase utility library
-#
-# Toolchain is exported by top-level makefile
-#
-# Top-level makefile also exports the following variables:
-#
-# COMPONENT  Name of component
-# EXPORT     Absolute path of export directory
-# TOP        Absolute path of source tree root
-#
-# The top-level makefile requires the following targets to exist:
-#
-# clean      Clean source tree
-# debug      Create a debug binary
-# distclean  Fully clean source tree, back to pristine condition
-# export     Export distributable components to ${EXPORT}
-# release    Create a release binary
-# setup      Perform any setup required prior to compilation
-# test       Execute any test cases
-
-# Manipulate include paths
-CFLAGS += -I$(TOP) -I$(CURDIR)
-
-# Release output
-RELEASE = libdomtest.a
-
-# Debug output
-DEBUG = libdomtest-debug.a
-
-# Objects
-OBJS = comparators list testassert testobject utils
-
-.PHONY: clean debug export release setup test
-
-# Targets
-release: $(addprefix Release/, $(addsuffix .o, $(OBJS)))
-	@${AR} ${ARFLAGS} $(RELEASE) Release/*
-
-debug: $(addprefix Debug/, $(addsuffix .o, $(OBJS)))
-	@${AR} ${ARFLAGS} $(DEBUG) Debug/*
-
-clean:
-ifneq (${OBJS}, )
-	-@${RM} ${RMFLAGS} $(addprefix Release/, $(addsuffix .o, ${OBJS}))
-	-@${RM} ${RMFLAGS} $(addprefix Debug/, $(addsuffix .o, ${OBJS}))
-endif
-	-@${RM} ${RMFLAGS} $(RELEASE) $(DEBUG)
-
-distclean:
-	-@${RM} ${RMFLAGS} -r Release
-	-@${RM} ${RMFLAGS} -r Debug
-
-setup:
-	@${MKDIR} ${MKDIRFLAGS} Release
-	@${MKDIR} ${MKDIRFLAGS} Debug
-
-export:
-
-test:
-
-# Pattern rules
-Release/%.o: %.c
-	@${ECHO} ${ECHOFLAGS} "==> $<"
-	@${CC} -c ${CFLAGS} -DNDEBUG -o $@ $<
-
-Debug/%.o: %.c
-	@${ECHO} ${ECHOFLAGS} "==> $<"
-	@${CC} -c -g ${CFLAGS} -o $@ $<
-
-- 
cgit v1.2.3