NeonXP/dumb-init
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'ckuehl_fix_lucid'

Browse source
This commit is contained in:
Chris Kuehl 2015-08-05 16:30:40 -07:00
commit 9e110230d5
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Makefile
View file

@ -26,7 +26,8 @@ docker-image:
itest: itest_lucid itest_precise itest_trusty itest_wheezy itest_jessie itest_stretch itest: itest_lucid itest_precise itest_trusty itest_wheezy itest_jessie itest_stretch
itest_lucid: builddeb-docker itest_lucid: builddeb-docker
docker run -v $(PWD):/mnt:ro ubuntu:lucid $(DOCKER_TEST) docker run -v $(PWD):/mnt:ro ubuntu:lucid \
sh -ec "apt-get -y install timeout; $(DOCKER_TEST)"
itest_precise: builddeb-docker itest_precise: builddeb-docker
docker run -v $(PWD):/mnt:ro ubuntu:precise $(DOCKER_TEST) docker run -v $(PWD):/mnt:ro ubuntu:precise $(DOCKER_TEST)

3
debian/rules vendored
View file

@ -1,3 +1,6 @@
#!/usr/bin/make -f #!/usr/bin/make -f
%: %:
dh $@ dh $@
override_dh_builddeb:
dh_builddeb -- -Zgzip

6
test/test
View file

@ -7,16 +7,18 @@
# (piping spawns additional subshells and makes it hard to get the right PID) # (piping spawns additional subshells and makes it hard to get the right PID)
fifo=$(mktemp -u) fifo=$(mktemp -u)
mkfifo -m 600 "$fifo" mkfifo -m 600 "$fifo"
read_cmd="timeout 1 head -n1 $fifo"
dumb-init ./print-signals "$fifo" & dumb-init ./print-signals "$fifo" &
pid="$!" pid="$!"
# Wait for `print-signals` to indicate it's ready. # Wait for `print-signals` to indicate it's ready.
head -n1 "$fifo" > /dev/null $read_cmd > /dev/null
for expected in $(catchable_signals); do for expected in $(catchable_signals); do
kill -s "$expected" "$pid" kill -s "$expected" "$pid"
echo -n "Sent signal ${expected}... " echo -n "Sent signal ${expected}... "
received=$(timeout 1 head -n1 "$fifo") || { received=$($read_cmd) || {
echo echo
echo "Error: Didn't receive signal within 1 second." echo "Error: Didn't receive signal within 1 second."
exit 1 exit 1