Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move unix sockets into /tmp. #101

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Move unix sockets into /tmp. #101

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2775a7
Move unix sockets into /tmp.
yarlB May 4, 2018
803fccf
Socket name include $$ and is cleaned no matter what between all tests
yarlB May 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 8 additions & 6 deletions tests/testrump.sh
View file
Open in desktop
Expand Up @@ -5,15 +5,16 @@

TESTDIR=${BRDIR}/tests
TESTOBJ=${OBJDIR}/brtests
SOCKPATH="/tmp/testrump_socket.$$"
SOCKURL="unix://${SOCKPATH}"

dosimpleclient ()
{

printf 'Remote communication ... '
export RUMP_SERVER="unix://mysocket"
export RUMP_SERVER="${SOCKURL}"
${DESTDIR}/bin/rump_server "${RUMP_SERVER}" || die rump_server failed
./simpleclient || die simpleclient failed
unset RUMP_SERVER
echo done
}

Expand Down Expand Up @@ -68,11 +69,11 @@ donettest_routed ()

rm -f busmem1 busmem2
./nettest_routed server || die nettest server failed
./nettest_routed router unix://routerctrl || die router fail
./nettest_routed router "${SOCKURL}" || die router fail
./nettest_routed client || die nettest client failed

# "code reuse ;)"
export RUMP_SERVER="unix://routerctrl"
export RUMP_SERVER="${SOCKURL}"
${TESTOBJ}/simpleclient/simpleclient || die failed to reboot router
echo done
}
Expand All @@ -84,11 +85,11 @@ donettest_routed6 ()

rm -f busmem1 busmem2
./nettest_routed6 server6 || die nettest server failed
./nettest_routed6 router6 unix://routerctrl || die router fail
./nettest_routed6 router6 "${SOCKURL}" || die router fail
./nettest_routed6 client6 || die nettest client failed

# "code reuse ;)"
export RUMP_SERVER="unix://routerctrl"
export RUMP_SERVER="${SOCKURL}"
${TESTOBJ}/simpleclient/simpleclient || die failed to reboot router
echo done
}
Expand Down Expand Up @@ -138,6 +139,7 @@ alltests ()
dependall || exit 1
) && ( cd ${TO} ; do${test} )
failed=$(( ${failed} + $? ))
rm -f "${SOCKPATH}"
done

pkill -TERM -P $$
Expand Down