diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2014-10-09 13:24:12 +0200 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2014-10-09 13:24:12 +0200 |
| commit | 595f6b02c854fdc412a180fc6767148d6eebd394 (patch) | |
| tree | ec20d12b00203d684db3ef44f2ed6e0390f7e02b /tests | |
| parent | c439b87bc9bc4d25982ec0044468bd405fac8296 (diff) | |
| download | crawler-595f6b02c854fdc412a180fc6767148d6eebd394.tar.gz crawler-595f6b02c854fdc412a180fc6767148d6eebd394.tar.bz2 | |
fixed some tests
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/GNUmakefile | 4 | ||||
| -rw-r--r-- | tests/url/GNUmakefile | 24 | ||||
| -rwxr-xr-x | tests/url/exec_test | 2 | ||||
| -rwxr-xr-x | tests/url/exec_test.cmd | 2 |
4 files changed, 31 insertions, 1 deletions
diff --git a/tests/GNUmakefile b/tests/GNUmakefile index 7f86834..e80f114 100644 --- a/tests/GNUmakefile +++ b/tests/GNUmakefile @@ -8,6 +8,10 @@ ifeq ($(WITH_CURL),1) SUBDIRS += libcurlpp endif +ifeq ($(WITH_LUA),1) +SUBDIRS += tolua +endif + -include $(TOPDIR)/makefiles/gmake/sub.mk local_all: diff --git a/tests/url/GNUmakefile b/tests/url/GNUmakefile index a2c4af3..0cf15da 100644 --- a/tests/url/GNUmakefile +++ b/tests/url/GNUmakefile @@ -13,11 +13,28 @@ INCLUDE_DIRS = \ -I$(TOPDIR)/include/util \ -I$(TOPDIR)/include/crawler +ifeq ($(WITH_LUA),1) +INCLUDE_DIRS += \ + -I$(TOPDIR)/include/luaglue \ + $(TOLUA_INCLUDES) +endif + +ifeq ($(WITH_LUA),1) +INCLUDE_CXXFLAGS += \ + -DWITH_LUA +endif + INCLUDE_LDFLAGS = \ -L$(TOPDIR)/src/libcrawler \ -L$(TOPDIR)/src/liblogger \ -L$(TOPDIR)/googleurl +ifeq ($(WITH_LUA),1) +INCLUDE_LDFLAGS += \ + -L$(TOPDIR)/src/libluaglue \ + $(TOLUA_LDFLAGS) +endif + INCLUDE_LIBS = \ -lcurl \ $(TOPDIR)/src/modules/urlnormalizer/simpleurl/libsimpleurlnormalizer.a \ @@ -27,6 +44,13 @@ INCLUDE_LIBS = \ -llogger \ -licui18n -licuuc +ifeq ($(WITH_LUA),1) +INCLUDE_LIBS += \ + -lluaglue \ + -llua \ + $(TOLUA_LIBS) +endif + TEST_CPP_BINS = \ test1$(EXE) diff --git a/tests/url/exec_test b/tests/url/exec_test index e3404b6..ab6f292 100755 --- a/tests/url/exec_test +++ b/tests/url/exec_test @@ -8,5 +8,5 @@ TITLE=$1 shift printf "$ID: $TITLE .. " -LD_LIBRARY_PATH=../../src:../../src/liblogger:../../src/libcrawler:../../googleurl ./$BINARY $* >$ID.RES 2>&1 +LD_LIBRARY_PATH=../../src:../../src/liblogger:../../src/libcrawler:../../googleurl:../../src/libluaglue ./$BINARY $* >$ID.RES 2>&1 diff $ID.MUST $ID.RES > $ID.DIFF && printf "OK\n" || printf "ERROR\n" diff --git a/tests/url/exec_test.cmd b/tests/url/exec_test.cmd index 79af578..294f5bd 100755 --- a/tests/url/exec_test.cmd +++ b/tests/url/exec_test.cmd @@ -10,6 +10,8 @@ shift copy ..\..\src\libutil\util.dll . >NUL
copy ..\..\src\libcrawler\crawler.dll . >NUL
copy ..\..\src\liblogger\logger.dll . >NUL
+copy ..\..\src\libluaglue\luaglue.dll . >NUL
+copy ..\..\lua\src\lua52.dll . >NUL
%BINARY% %1 %2 %3 %4 >%ID%.OUT 2>%ID%.ERR
type %ID%.ERR >> %ID%.OUT
..\..\utils\win32\dos2unix <%ID%.OUT >%ID%.RES
|