diff options
| author |  Brendan Taylor <whateley@gmail.com> | 2009-10-12 17:06:24 -0600 |
|---|---|---|
| committer | Brendan Taylor <whateley@gmail.com> | 2009-10-12 17:06:24 -0600 |
| commit | 87979aa993c4c73374999ca420c8af09fe47ca13 (patch) | |
| tree | 467cd51defef4e570b30f9e134a9d46ab333e079 /tests | |
| parent | d2d73ad463f3d9f1c673d37457af159947b3faac (diff) | |
| parent | 1769b555deae08e7bbe9466ff650ef37200e8e4c (diff) | |
Merge remote branch 'dieterbe/experimental'
Conflicts:
uzbl-core.c
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile | 4 | ||||
| -rw-r--r-- | tests/test-command.c | 8 | ||||
| -rw-r--r-- | tests/test-expand.c | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/tests/Makefile b/tests/Makefile index 9db398a..3f63adf 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,4 +1,4 @@ -CFLAGS:=-std=c99 -I$(shell pwd)/../ -L$(shell pwd) -luzbl $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DG_ERRORCHECK_MUTEXES -DCOMMIT="\"$(shell git log | head -n1 | sed "s/.* //")\"" $(CPPFLAGS) +CFLAGS:=-std=c99 -I$(shell pwd)/../ -L$(shell pwd) -luzbl-core $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DG_ERRORCHECK_MUTEXES -DCOMMIT="\"$(shell git log | head -n1 | sed "s/.* //")\"" $(CPPFLAGS) CFLAGS!=echo -std=c99 `pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -ggdb -Wall -W -DARCH='"\""'`uname -m`'"\""' -lgthread-2.0 -DG_ERRORCHECK_MUTEXES -DCOMMIT='"\""'`git log | head -n1 | sed "s/.* //"`'"\""' $(CPPFLAGS) LDFLAGS:=$(shell pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -pthread $(LDFLAGS) @@ -14,4 +14,4 @@ all: $(TEST_PROGS) clean: rm -f $(TEST_PROGS) - rm -f libuzbl.so + rm -f libuzbl-core.so diff --git a/tests/test-command.c b/tests/test-command.c index aee4bf2..2a226b2 100644 --- a/tests/test-command.c +++ b/tests/test-command.c @@ -22,10 +22,10 @@ #include <fcntl.h> #include <signal.h> -#include <uzbl.h> +#include <uzbl-core.h> #include <config.h> -extern Uzbl uzbl; +extern UzblCore uzbl; void test_keycmd (void) { @@ -35,13 +35,13 @@ test_keycmd (void) { /* the 'keycmd' command */ parse_command("keycmd", "insert", NULL); - g_assert_cmpint(1, ==, uzbl.behave.insert_mode); + g_assert_cmpint(1, ==, uzbl.behave.forward_keys); g_assert_cmpstr("", ==, uzbl.state.keycmd); /* setting the keycmd variable directly, equivalent to the 'keycmd' comand */ set_var_value("keycmd", "command"); - g_assert_cmpint(0, ==, uzbl.behave.insert_mode); + g_assert_cmpint(0, ==, uzbl.behave.forward_keys); g_assert_cmpstr("", ==, uzbl.state.keycmd); } diff --git a/tests/test-expand.c b/tests/test-expand.c index 2299227..f01e5c7 100644 --- a/tests/test-expand.c +++ b/tests/test-expand.c @@ -22,10 +22,10 @@ #include <fcntl.h> #include <signal.h> -#include <uzbl.h> +#include <uzbl-core.h> #include <config.h> -extern Uzbl uzbl; +extern UzblCore uzbl; extern gchar* expand(char*, guint); extern void make_var_to_name_hash(void); @@ -79,10 +79,10 @@ test_NAME (void) { void test_MODE (void) { - set_var_value("insert_mode", "0"); + set_var_value("forward_keys", "0"); g_assert_cmpstr(expand("@MODE", 0), ==, "C"); - set_var_value("insert_mode", "1"); + set_var_value("forward_keys", "1"); g_assert_cmpstr(expand("@MODE", 0), ==, "I"); } |