Merge branch 'wip-tests' of github.com:troglobit/finit into wip-tests

test/Makefile

@@ -3,6 +3,7 @@
 ARCH ?= x86_64
 
 FINITBIN ?= ../src/finit
+INITCTLBIN ?= ../src/initctl
 
 BBVER ?= 1.31.0
 BBBIN = busybox-$(ARCH)
@@ -68,11 +69,14 @@ $(testroot_bin)/chrootsetup.sh: chrootsetup.sh
 $(testroot)/sbin/finit: $(FINITBIN) $(libs)
 	cp $< $@
 
+$(testroot)/bin/initctl: $(INITCTLBIN) $(libs)
+	cp $< $@
+
 $(libs):
 	mkdir -p $(dir $@)
 	cp $(shell echo $@ | sed s/^$(testroot)//) $@
 
-check: $(binaries) $(testroot_bin)/chrootsetup.sh $(dirs) $(testroot)/sbin/finit
+check: $(binaries) $(testroot_bin)/chrootsetup.sh $(dirs) $(testroot)/sbin/finit $(testroot)/bin/initctl
 	./runtest.sh test_start_stop_service/test.sh
 
 test-check:

test/chrootsetup.sh

@@ -22,6 +22,8 @@ mount -t tmpfs none /etc
 # mkdir -p /dev/pts
 # mount -t devpts none /dev/pts
 
+mkdir -p "$FINIT_CONF_DIR"
+
 tty=/dev/$(cat /sys/class/tty/console/active)
 mkfifo "$tty"
 

test/runtest.sh

@@ -85,7 +85,8 @@ shift
 
 trap teardown EXIT
 
-FINIT_CONF=$(grep FINIT_CONF "$(dirname "$0")/../config.h" | cut -d' ' -f3 | cut -d'"' -f2)
+export FINIT_CONF=$(grep FINIT_CONF "$(dirname "$0")/../config.h" | cut -d' ' -f3 | cut -d'"' -f2)
+export FINIT_CONF_DIR="$(dirname "$FINIT_CONF")"/finit.d
 
 log "$color_reset" 'Test start' ''
 log "$color_reset" '--' ''
@@ -97,7 +98,8 @@ log "$color_reset" '--' ''
 >&2 echo Filesystem:
 >&2 ./testenv_start.sh find / -path /sys -prune -o -print -path /proc -prune -o -print
 >&2 echo --
->&2 echo "FINIT_CONF='$FINIT_CONF"
+>&2 echo "FINIT_CONF='$FINIT_CONF'"
+>&2 echo "FINIT_CONF_DIR='$FINIT_CONF_DIR/'"
 
 # Setup
 ./testenv_start.sh finit &