summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAndreas Baumann <abaumann@yahoo.com>2012-09-07 15:15:28 +0200
committerAndreas Baumann <abaumann@yahoo.com>2012-09-07 15:15:28 +0200
commit4cb96d5377df049bd49bb6c0a109d89fcbd015ff (patch)
treec52b2a07fbf2176505015f3bc8ecc12f8466dc71 /tests
parentdcbeb3ab19da5393877b1ef4db2ac26d8a5787c0 (diff)
downloadcrawler-4cb96d5377df049bd49bb6c0a109d89fcbd015ff.tar.gz
crawler-4cb96d5377df049bd49bb6c0a109d89fcbd015ff.tar.bz2
fixed some linker errors on FreeBSD (should also affect Linux, but there everything worked?)
Diffstat (limited to 'tests')
-rw-r--r--tests/fetcher/GNUmakefile2
-rwxr-xr-xtests/fetcher/run.sh2
-rwxr-xr-xtests/logger/GNUmakefile2
-rwxr-xr-xtests/modules/GNUmakefile2
-rwxr-xr-xtests/modules/exec_test2
-rwxr-xr-xtests/modules/libcommon/GNUmakefile2
-rwxr-xr-xtests/modules/testmod/GNUmakefile2
-rwxr-xr-xtests/modules/testmod2/GNUmakefile2
-rwxr-xr-xtests/modules/testmod3/GNUmakefile2
-rw-r--r--tests/typedetect/GNUmakefile2
-rwxr-xr-xtests/typedetect/exec_test2
-rw-r--r--tests/url/GNUmakefile2
-rwxr-xr-xtests/url/exec_test2
13 files changed, 13 insertions, 13 deletions
diff --git a/tests/fetcher/GNUmakefile b/tests/fetcher/GNUmakefile
index 2b4552d..b89e795 100644
--- a/tests/fetcher/GNUmakefile
+++ b/tests/fetcher/GNUmakefile
@@ -14,7 +14,7 @@ INCLUDE_DIRS = \
-I$(TOPDIR)/src/modules/fetcher/libfetch
INCLUDE_LDFLAGS = \
- -L$(TOPDIR)/src \
+ -L$(TOPDIR)/src/libcrawler \
-L$(TOPDIR)/src/logger \
-L$(TOPDIR)/libfetch
diff --git a/tests/fetcher/run.sh b/tests/fetcher/run.sh
index 7a10182..c17fa87 100755
--- a/tests/fetcher/run.sh
+++ b/tests/fetcher/run.sh
@@ -1,4 +1,4 @@
#!/bin/sh
-LD_LIBRARY_PATH=../../src:../../src/logger:../../libfetch ./test1 $*
+LD_LIBRARY_PATH=../../src:../../src/logger:../../src/libcrawler:../../libfetch ./test1 $*
diff --git a/tests/logger/GNUmakefile b/tests/logger/GNUmakefile
index 6578f15..733f860 100755
--- a/tests/logger/GNUmakefile
+++ b/tests/logger/GNUmakefile
@@ -10,7 +10,7 @@ INCLUDE_DIRS = \
INCLUDE_LDFLAGS =
INCLUDE_LIBS = \
- $(TOPDIR)/src/libcrawler.a \
+ $(TOPDIR)/src/libcrawler/libcrawler.a \
$(TOPDIR)/src/logger/liblogger.a
TEST_CPP_BINS = \
diff --git a/tests/modules/GNUmakefile b/tests/modules/GNUmakefile
index e00e9c9..e0e51e2 100755
--- a/tests/modules/GNUmakefile
+++ b/tests/modules/GNUmakefile
@@ -13,7 +13,7 @@ INCLUDE_LDFLAGS = \
-L$(TOPDIR)/tests/modules/libcommon
INCLUDE_LIBS = \
- $(TOPDIR)/src/libcrawler.a \
+ $(TOPDIR)/src/libcrawler/libcrawler.a \
-llogger -lcommon
TEST_CPP_BINS = \
diff --git a/tests/modules/exec_test b/tests/modules/exec_test
index 096a7ba..05c9a61 100755
--- a/tests/modules/exec_test
+++ b/tests/modules/exec_test
@@ -4,5 +4,5 @@ BINARY=$1
TITLE=$2
printf "$BINARY: $TITLE .. "
-LD_LIBRARY_PATH=../../src:../../src/logger:libcommon ./$BINARY >$BINARY.RES 2>&1
+LD_LIBRARY_PATH=../../src:../../src/logger:../../src/libcrawler:libcommon ./$BINARY >$BINARY.RES 2>&1
diff $BINARY.MUST $BINARY.RES > $BINARY.DIFF && printf "OK\n" || printf "ERROR\n"
diff --git a/tests/modules/libcommon/GNUmakefile b/tests/modules/libcommon/GNUmakefile
index bb2df86..e4a5c98 100755
--- a/tests/modules/libcommon/GNUmakefile
+++ b/tests/modules/libcommon/GNUmakefile
@@ -11,7 +11,7 @@ INCLUDE_LDFLAGS = \
-L$(TOPDIR)/src/logger
INCLUDE_LIBS = \
- $(TOPDIR)/src/libcrawler.a \
+ $(TOPDIR)/src/libcrawler/libcrawler.a \
-llogger
STATIC_LIB = libcommon.a
diff --git a/tests/modules/testmod/GNUmakefile b/tests/modules/testmod/GNUmakefile
index c8fbc8a..0e95bca 100755
--- a/tests/modules/testmod/GNUmakefile
+++ b/tests/modules/testmod/GNUmakefile
@@ -12,7 +12,7 @@ INCLUDE_DIRS = \
INCLUDE_CXXFLAGS = \
INCLUDE_LDFLAGS = \
- -L$(TOPDIR)/src
+ -L$(TOPDIR)/src/libcrawler
INCLUDE_LIBS = \
-lcrawler
diff --git a/tests/modules/testmod2/GNUmakefile b/tests/modules/testmod2/GNUmakefile
index 2511adb..9dec234 100755
--- a/tests/modules/testmod2/GNUmakefile
+++ b/tests/modules/testmod2/GNUmakefile
@@ -13,7 +13,7 @@ INCLUDE_DIRS = \
INCLUDE_CXXFLAGS = \
INCLUDE_LDFLAGS = \
- -L$(TOPDIR)/src
+ -L$(TOPDIR)/src/libcrawler
INCLUDE_LIBS = \
-lcrawler
diff --git a/tests/modules/testmod3/GNUmakefile b/tests/modules/testmod3/GNUmakefile
index be1b104..13e1f9e 100755
--- a/tests/modules/testmod3/GNUmakefile
+++ b/tests/modules/testmod3/GNUmakefile
@@ -13,7 +13,7 @@ INCLUDE_DIRS = \
INCLUDE_CXXFLAGS = \
INCLUDE_LDFLAGS = \
- -L$(TOPDIR)/src
+ -L$(TOPDIR)/src/libcrawler
INCLUDE_LIBS = \
-lcrawler
diff --git a/tests/typedetect/GNUmakefile b/tests/typedetect/GNUmakefile
index d8656fa..9de8acf 100644
--- a/tests/typedetect/GNUmakefile
+++ b/tests/typedetect/GNUmakefile
@@ -16,7 +16,7 @@ INCLUDE_DIRS = \
-I$(TOPDIR)/src/modules/urlnormalizer/simpleurl
INCLUDE_LDFLAGS = \
- -L$(TOPDIR)/src \
+ -L$(TOPDIR)/src/libcrawler \
-L$(TOPDIR)/src/logger \
-L$(TOPDIR)/libfetch
diff --git a/tests/typedetect/exec_test b/tests/typedetect/exec_test
index 58747f4..ed30e86 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/logger:../../libfetch ./$BINARY $* >$ID.RES 2>&1
+LD_LIBRARY_PATH=../../src:../../src/logger:../../src/libcrawler:../../libfetch ./$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 1325f30..678a914 100644
--- a/tests/url/GNUmakefile
+++ b/tests/url/GNUmakefile
@@ -14,7 +14,7 @@ INCLUDE_DIRS = \
-I$(TOPDIR)/include/crawler
INCLUDE_LDFLAGS = \
- -L$(TOPDIR)/src \
+ -L$(TOPDIR)/src/libcrawler \
-L$(TOPDIR)/src/logger \
-L$(TOPDIR)/googleurl
diff --git a/tests/url/exec_test b/tests/url/exec_test
index 5ad22e1..ae9310e 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/logger:../../googleurl ./$BINARY $* >$ID.RES 2>&1
+LD_LIBRARY_PATH=../../src:../../src/logger:../../src/libcrawler:../../googleurl ./$BINARY $* >$ID.RES 2>&1
diff $ID.MUST $ID.RES > $ID.DIFF && printf "OK\n" || printf "ERROR\n"