From 00fbb3b2a6301e9694386480e44eaad4f59ee83c Mon Sep 17 00:00:00 2001
From: uranther <jwheaton@purdue.edu>
Date: Wed, 24 Jun 2009 16:33:30 -0400
Subject: Preliminary uzbl testing framework - props to bct for the help

---
 Makefile | 45 +++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 9254e54..a20e532 100644
--- a/Makefile
+++ b/Makefile
@@ -4,8 +4,47 @@ all: uzbl uzblctrl
 
 PREFIX?=$(DESTDIR)/usr
 
-test: uzbl
-	./uzbl --uri http://www.uzbl.org --verbose
+# When compiling unit tests, compile uzbl as a library first
+test: uzbl.o
+	$(CC) -DUZBL_LIBRARY -shared -Wl uzbl.o -o ./tests/libuzbl.so
+	cd ./tests/; $(MAKE)
+
+# test-report: run tests in subdirs and generate report
+# perf-report: run tests in subdirs with -m perf and generate report
+# full-report: like test-report: with -m perf and -m slow
+#test-report perf-report full-report:    ${TEST_PROGS}
+#	@test -z "${TEST_PROGS}" || { \
+#          case $@ in \
+#          test-report) test_options="-k";; \
+#          perf-report) test_options="-k -m=perf";; \
+#          full-report) test_options="-k -m=perf -m=slow";; \
+#          esac ; \
+#          if test -z "$$GTESTER_LOGDIR" ; then  \
+#            ${GTESTER} --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \
+#          elif test -n "${TEST_PROGS}" ; then \
+#            ${GTESTER} --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \
+#          fi ; \
+#        }
+#	@ ignore_logdir=true ; \
+#          if test -z "$$GTESTER_LOGDIR" ; then \
+#            GTESTER_LOGDIR=`mktemp -d "\`pwd\`/.testlogs-XXXXXX"`; export GTESTER_LOGDIR ; \
+#            ignore_logdir=false ; \
+#          fi ; \
+#          for subdir in $(SUBDIRS) . ; do \
+#            test "$$subdir" = "." -o "$$subdir" = "po" || \
+#            ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
+#          done ; \
+#          $$ignore_logdir || { \
+#            echo '<?xml version="1.0"?>' > $@.xml ; \
+#            echo '<report-collection>'  >> $@.xml ; \
+#            for lf in `ls -L "$$GTESTER_LOGDIR"/.` ; do \
+#              sed '1,1s/^<?xml\b[^>?]*?>//' <"$$GTESTER_LOGDIR"/"$$lf" >> $@.xml ; \
+#            done ; \
+#            echo >> $@.xml ; \
+#            echo '</report-collection>' >> $@.xml ; \
+#            rm -rf "$$GTESTER_LOGDIR"/ ; \
+#            ${GTESTER_REPORT} --version 2>/dev/null 1>&2 ; test "$$?" != 0 || ${GTESTER_REPORT} $@.xml >$@.html ; \
+#          }
 
 test-dev: uzbl
 	XDG_DATA_HOME=./examples/data               XDG_CONFIG_HOME=./examples/config               ./uzbl --uri http://www.uzbl.org --verbose
@@ -17,6 +56,8 @@ test-share: uzbl
 clean:
 	rm -f uzbl
 	rm -f uzblctrl
+	rm -f uzbl.o
+	cd ./tests/; $(MAKE) clean
 
 install:
 	install -d $(PREFIX)/bin
-- 
cgit v1.2.3


From 585728e9b0f9a284859cdce2d47d38d24c64ec2d Mon Sep 17 00:00:00 2001
From: uranther <jwheaton@purdue.edu>
Date: Tue, 14 Jul 2009 16:28:29 -0400
Subject: Removed commented section of Makefile that would produce XML/HTML
 reports of unit tests

---
 Makefile | 37 -------------------------------------
 1 file changed, 37 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 960ea20..b2f4431 100644
--- a/Makefile
+++ b/Makefile
@@ -9,43 +9,6 @@ test: uzbl.o
 	$(CC) -DUZBL_LIBRARY -shared -Wl uzbl.o -o ./tests/libuzbl.so
 	cd ./tests/; $(MAKE)
 
-# test-report: run tests in subdirs and generate report
-# perf-report: run tests in subdirs with -m perf and generate report
-# full-report: like test-report: with -m perf and -m slow
-#test-report perf-report full-report:    ${TEST_PROGS}
-#	@test -z "${TEST_PROGS}" || { \
-#          case $@ in \
-#          test-report) test_options="-k";; \
-#          perf-report) test_options="-k -m=perf";; \
-#          full-report) test_options="-k -m=perf -m=slow";; \
-#          esac ; \
-#          if test -z "$$GTESTER_LOGDIR" ; then  \
-#            ${GTESTER} --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \
-#          elif test -n "${TEST_PROGS}" ; then \
-#            ${GTESTER} --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \
-#          fi ; \
-#        }
-#	@ ignore_logdir=true ; \
-#          if test -z "$$GTESTER_LOGDIR" ; then \
-#            GTESTER_LOGDIR=`mktemp -d "\`pwd\`/.testlogs-XXXXXX"`; export GTESTER_LOGDIR ; \
-#            ignore_logdir=false ; \
-#          fi ; \
-#          for subdir in $(SUBDIRS) . ; do \
-#            test "$$subdir" = "." -o "$$subdir" = "po" || \
-#            ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
-#          done ; \
-#          $$ignore_logdir || { \
-#            echo '<?xml version="1.0"?>' > $@.xml ; \
-#            echo '<report-collection>'  >> $@.xml ; \
-#            for lf in `ls -L "$$GTESTER_LOGDIR"/.` ; do \
-#              sed '1,1s/^<?xml\b[^>?]*?>//' <"$$GTESTER_LOGDIR"/"$$lf" >> $@.xml ; \
-#            done ; \
-#            echo >> $@.xml ; \
-#            echo '</report-collection>' >> $@.xml ; \
-#            rm -rf "$$GTESTER_LOGDIR"/ ; \
-#            ${GTESTER_REPORT} --version 2>/dev/null 1>&2 ; test "$$?" != 0 || ${GTESTER_REPORT} $@.xml >$@.html ; \
-#          }
-
 test-dev: uzbl
 	XDG_DATA_HOME=./examples/data               XDG_CONFIG_HOME=./examples/config               ./uzbl --uri http://www.uzbl.org --verbose
 
-- 
cgit v1.2.3