diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2014-10-14 14:49:38 +0200 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2014-10-14 14:49:38 +0200 |
| commit | 2023ec5092d5fe6a79fcac9e34e79760f7d00375 (patch) | |
| tree | dc233421810f880dbe18076751d69b35ea00f340 | |
| parent | 6a2ee0a230b7c7957496ca61ee186901f1af427a (diff) | |
| download | crawler-2023ec5092d5fe6a79fcac9e34e79760f7d00375.tar.gz crawler-2023ec5092d5fe6a79fcac9e34e79760f7d00375.tar.bz2 | |
fixed more Linux tests
| -rw-r--r-- | tests/typedetect/GNUmakefile | 15 | ||||
| -rwxr-xr-x | tests/typedetect/exec_test | 2 | ||||
| -rw-r--r-- | tests/url/GNUmakefile | 2 | ||||
| -rwxr-xr-x | tests/url/exec_test | 2 |
4 files changed, 19 insertions, 2 deletions
diff --git a/tests/typedetect/GNUmakefile b/tests/typedetect/GNUmakefile index 2455556..793e110 100644 --- a/tests/typedetect/GNUmakefile +++ b/tests/typedetect/GNUmakefile @@ -20,6 +20,13 @@ INCLUDE_LDFLAGS = \ -L$(TOPDIR)/src/liblogger \ -L$(TOPDIR)/libfetch +ifeq ($(WITH_LUA),1) +INCLUDE_LDFLAGS += \ + -L$(TOPDIR)/src/libluaglue \ + -L$(TOPDIR)/src/libutil \ + $(TOLUA_LDFLAGS) +endif + INCLUDE_LIBS = \ $(TOPDIR)/src/modules/typedetect/libmagic/liblibmagictypedetect.a \ -lmagic \ @@ -30,6 +37,14 @@ INCLUDE_LIBS = \ -lcrawler \ -llogger +ifeq ($(WITH_LUA),1) +INCLUDE_LIBS += \ + -lluaglue \ + -lutil \ + -llua \ + $(TOLUA_LIBS) +endif + # openssl ifeq ($(WITH_SSL),1) diff --git a/tests/typedetect/exec_test b/tests/typedetect/exec_test index 9d5b83c..d8e7b33 100755 --- a/tests/typedetect/exec_test +++ b/tests/typedetect/exec_test @@ -8,5 +8,5 @@ TITLE=$1 shift printf "$ID: $TITLE .. " -LD_LIBRARY_PATH=../../src:../../src/liblogger:../../src/libcrawler:../../libfetch ./$BINARY $* >$ID.RES 2>&1 +LD_LIBRARY_PATH=../../src:../../src/liblogger:../../src/libcrawler:../../libfetch:../../src/libluaglue:../../src/libutil ./$BINARY $* >$ID.RES 2>&1 diff $ID.MUST $ID.RES > $ID.DIFF && printf "OK\n" || printf "ERROR\n" diff --git a/tests/url/GNUmakefile b/tests/url/GNUmakefile index 0cf15da..60ec5cf 100644 --- a/tests/url/GNUmakefile +++ b/tests/url/GNUmakefile @@ -32,6 +32,7 @@ INCLUDE_LDFLAGS = \ ifeq ($(WITH_LUA),1) INCLUDE_LDFLAGS += \ -L$(TOPDIR)/src/libluaglue \ + -L$(TOPDIR)/src/libutil \ $(TOLUA_LDFLAGS) endif @@ -47,6 +48,7 @@ INCLUDE_LIBS = \ ifeq ($(WITH_LUA),1) INCLUDE_LIBS += \ -lluaglue \ + -lutil \ -llua \ $(TOLUA_LIBS) endif diff --git a/tests/url/exec_test b/tests/url/exec_test index ab6f292..ea433da 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:../../src/libluaglue ./$BINARY $* >$ID.RES 2>&1 +LD_LIBRARY_PATH=../../src:../../src/liblogger:../../src/libcrawler:../../googleurl:../../src/libluaglue:../../src/libutil ./$BINARY $* >$ID.RES 2>&1 diff $ID.MUST $ID.RES > $ID.DIFF && printf "OK\n" || printf "ERROR\n" |