Commit 92533bea authored by Natanael Copa's avatar Natanael Copa

test: dont run sh manually but respect #!/bin/sh in each test

That way we can set sh options case by case
parent 2dd7ad9a
...@@ -2,3 +2,5 @@ src ...@@ -2,3 +2,5 @@ src
pkg pkg
*.apk *.apk
*.tar.gz *.tar.gz
conf.mk
-include conf.mk
repos := repo1 repo2 repos := repo1 repo2
...@@ -6,8 +7,8 @@ testroot = $(tmproot)/$(basename $@) ...@@ -6,8 +7,8 @@ testroot = $(tmproot)/$(basename $@)
SUDO := sudo SUDO := sudo
APK := ../src/apk --keys-dir /etc/apk/keys 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 LD_LIBRARY_PATH = ../src
export LD_LIBRARY_PATH SYSREPO export LD_LIBRARY_PATH SYSREPO
...@@ -41,7 +42,7 @@ repos.stamp: $(repos) ...@@ -41,7 +42,7 @@ repos.stamp: $(repos)
@echo -n "$<"; \ @echo -n "$<"; \
rm -rf "$(testroot)" ;\ rm -rf "$(testroot)" ;\
mkdir -p "$(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";\ echo " FAIL";\
exit 1;\ exit 1;\
fi ;\ fi ;\
......
#!/bin/sh #!/bin/sh -e
# desc: test if basic add/del/upgrade works # desc: test if basic add/del/upgrade works
......
#!/bin/sh #!/bin/sh -e
# desc: test if dependencies works # desc: test if dependencies works
......
#!/bin/sh #!/bin/sh -e
# desc: test successful pre-install # desc: test successful pre-install
......
#!/bin/sh #!/bin/sh -e
# desc: test failing pre-install # desc: test failing pre-install
......
#!/bin/sh #!/bin/sh -e
# desc: test post-install script # desc: test post-install script
......
#!/bin/sh #!/bin/sh -e
# desc: test triggers in kernel package # desc: test triggers in kernel package
......
#!/bin/sh #!/bin/sh -e
# desc: test triggers in busybox package # desc: test triggers in busybox package
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment