diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 45 | ||||
| -rw-r--r-- | tests/Makefile | 14 | ||||
| -rw-r--r-- | tests/test-1.c | 47 | ||||
| -rw-r--r-- | uzbl.c | 10 | ||||
| -rw-r--r-- | uzbl.h | 3 |
6 files changed, 114 insertions, 6 deletions
@@ -1,5 +1,6 @@ uzbl uzblctrl +uzbl.o *~ tags examples/data @@ -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 diff --git a/tests/Makefile b/tests/Makefile new file mode 100644 index 0000000..43a878b --- /dev/null +++ b/tests/Makefile @@ -0,0 +1,14 @@ +CFLAGS:=-std=c99 -I$(shell pwd)/../ -L$(shell pwd) -luzbl $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -DG_ERRORCHECK_MUTEXES -DCOMMIT="\"$(shell git log | head -n1 | sed "s/.* //")\"" $(CPPFLAGS) +LDFLAGS:=$(shell pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4) -pthread $(LDFLAGS) + +GTESTER:=gtester +GTESTER_REPORT:=gtester-report + +TEST_PROGS:=test-1 + +all: $(TEST_PROGS) + LD_LIBRARY_PATH="$LD_LIBRARY_PATH:." $(GTESTER) --verbose $(TEST_PROGS) + +clean: + rm -f $(TEST_PROGS) + rm -f libuzbl.so diff --git a/tests/test-1.c b/tests/test-1.c new file mode 100644 index 0000000..0fb86b6 --- /dev/null +++ b/tests/test-1.c @@ -0,0 +1,47 @@ +/* -*- c-basic-offset: 4; -*- */ +#define _POSIX_SOURCE + +#include <gtk/gtk.h> +#include <gdk/gdkx.h> +#include <gdk/gdkkeysyms.h> +#include <sys/socket.h> +#include <sys/stat.h> +#include <sys/types.h> +#include <sys/un.h> +#include <sys/utsname.h> +#include <sys/time.h> +#include <webkit/webkit.h> +#include <libsoup/soup.h> + +#include <stdio.h> +#include <string.h> +#include <unistd.h> +#include <stdlib.h> +#include <errno.h> +#include <fcntl.h> +#include <signal.h> + +#include <uzbl.h> +#include <config.h> + +Uzbl uzbl; + +static void +test_URI (void) { + setup_scanner(); + uzbl.state.uri = g_strdup("http://www.uzbl.org"); + g_assert_cmpstr(expand_template("URI", FALSE), ==, uzbl.state.uri); + g_free(uzbl.state.uri); +} + +int +main (int argc, char *argv[]) { + g_type_init(); + g_test_init(&argc, &argv, NULL); + + g_test_add_func("/test-1/URI", test_URI); + + return g_test_run(); +} + +/* vi: set et ts=4: */ @@ -289,8 +289,8 @@ read_file_by_line (gchar *path) { return lines; } -static -gchar* parseenv (char* string) { +gchar* +parseenv (char* string) { extern char** environ; gchar* tmpstr = NULL; int i = 0; @@ -2047,8 +2047,8 @@ create_mainbar () { return g->mainbar; } -static -GtkWidget* create_window () { +GtkWidget* +create_window () { GtkWidget* window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_default_size (GTK_WINDOW (window), 800, 600); gtk_widget_set_name (window, "Uzbl browser"); @@ -2425,6 +2425,7 @@ dump_config() { g_hash_table_foreach(uzbl.bindings, dump_key_hash, NULL); } +#ifndef UZBL_LIBRARY /** -- MAIN -- **/ int main (int argc, char* argv[]) { @@ -2535,5 +2536,6 @@ main (int argc, char* argv[]) { return EXIT_SUCCESS; } +#endif /* vi: set et ts=4: */ @@ -217,6 +217,9 @@ XDG_Var XDG[] = }; /* Functions */ +gchar * +expand_template(const char *template, gboolean escape_markup); + void setup_scanner(); |