summaryrefslogtreecommitdiff
path: root/test/Makefile
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-06-15 15:14:18 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-06-15 15:53:32 +0000
commit92533beae08fb440625f7ef79ed19226a9bc2e71 (patch)
treeb543ab79257fb7ff05770192caaacef6bbb78de3 /test/Makefile
parent2dd7ad9a9b9d34bb577da4365569f4f56256d0e5 (diff)
downloadapk-tools-92533beae08fb440625f7ef79ed19226a9bc2e71.tar.gz
apk-tools-92533beae08fb440625f7ef79ed19226a9bc2e71.tar.bz2
apk-tools-92533beae08fb440625f7ef79ed19226a9bc2e71.tar.xz
apk-tools-92533beae08fb440625f7ef79ed19226a9bc2e71.zip
test: dont run sh manually but respect #!/bin/sh in each test
That way we can set sh options case by case
Diffstat (limited to 'test/Makefile')
-rw-r--r--test/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/test/Makefile b/test/Makefile
index 23f3183..417ed1a 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,3 +1,4 @@
+-include conf.mk
repos := repo1 repo2
@@ -6,8 +7,8 @@ testroot = $(tmproot)/$(basename $@)
SUDO := sudo
APK := ../src/apk --keys-dir /etc/apk/keys
-#SYSREPO ?= http://alpinelinux.org/cgi-bin/dl.cgi/edge/main
-SYSREPO ?= http://192.168.8.4/main
+
+SYSREPO ?= http://alpinelinux.org/cgi-bin/dl.cgi/edge/main
LD_LIBRARY_PATH = ../src
export LD_LIBRARY_PATH SYSREPO
@@ -41,7 +42,7 @@ repos.stamp: $(repos)
@echo -n "$<"; \
rm -rf "$(testroot)" ;\
mkdir -p "$(testroot)"; \
- if ! APK="$(APK)" ROOT="$(testroot)" SYSREPO="$(SYSREPO)" sh -e $< > $(basename $@).out 2>&1; then\
+ if ! APK="$(APK)" ROOT="$(testroot)" SYSREPO="$(SYSREPO)" ./$< > $(basename $@).out 2>&1; then\
echo " FAIL";\
exit 1;\
fi ;\