experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Last minute documentation and testing changes befoire 4.6

Browse source
This commit is contained in:
Olof hagsand 2020-08-13 14:58:42 +02:00
parent 8f9aa9bc80
commit 3d33335f4b
10 changed files with 23 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

3
test/config.sh.in
View file

@ -5,4 +5,5 @@ WITH_RESTCONF=@with_restconf@ # evhtp, fcgi or ""
WITH_LIBXML2=@with_libxml2@ # yes or ""
CXX=@CXX@
CC=@CC@
WWWUSER=@wwwuser@
WWWDIR=@wwwdir@

12
test/lib.sh
View file

@ -105,10 +105,6 @@ fi
# RESTCONF protocol, eg http or https
: ${RCPROTO:=http}
# www user (on linux typically www-data, freebsd www)
# @see wwwstartuser which can be dropped to this
: ${wwwuser:=www-data}
# www user (on linux typically www-data, freebsd www)
# Start restconf user, can be root which is dropped to wwwuser
: ${wwwstartuser:=root}
@ -136,9 +132,9 @@ BUSER=clicon
: ${clixon_cli:=clixon_cli}
: ${clixon_netconf:=clixon_netconf}
: ${clixon_netconf:=$(which clixon_netconf)}
: ${clixon_restconf:=/www-data/clixon_restconf}
: ${clixon_restconf:=$WWWDIR/clixon_restconf}
: ${clixon_backend:=clixon_backend}
@ -268,9 +264,9 @@ stop_restconf_pre(){
# Stop restconf daemon after test
# Two caveats in pkill:
# 1) Dont use $clixon_restconf (dont work in valgrind)
# 2) Dont use -u $wwwuser since clixon_restconf may drop privileges.
# 2) Dont use -u $WWWUSER since clixon_restconf may drop privileges.
stop_restconf(){
# sudo pkill -u $wwwuser -f clixon_restconf # Dont use $clixon_restoconf doesnt work in valgrind
# sudo pkill -u $WWWUSER -f clixon_restconf # Dont use $clixon_restoconf doesnt work in valgrind
sudo pkill -f clixon_restconf
if [ $valgrindtest -eq 3 ]; then
sleep 1

9
test/vagrant/vagrant.sh
View file

@ -195,7 +195,7 @@ case $release in
# restconf
case ${with_restconf} in
fcgi)
buildfcgi=true # some ubuntu dont have fcgidev
buildfcgi=true # some ubuntu dont have fcgi-dev
$sshcmd sudo apt install -y nginx
;;
evhtp)
@ -258,7 +258,6 @@ case ${with_restconf} in
$sshcmd "(cd cmake; sudo make install)"
fi
if $buildevhtp; then
if true; then
$sshcmd << 'EOF'
test -d libevhtp || sudo git clone https://github.com/criticalstack/libevhtp.git
cd libevhtp/build;
@ -267,12 +266,6 @@ case ${with_restconf} in
sudo make
sudo make install
EOF
else
$sshcmd "test -d libevhtp || sudo git clone https://github.com/criticalstack/libevhtp.git"
$sshcmd "(cd libevhtp/build; sudo /usr/local/bin/cmake -DEVHTP_DISABLE_REGEX=ON -DEVHTP_DISABLE_EVTHR=ON ..)"
$sshcmd "(cd libevhtp/build; sudo make)"
$sshcmd "(cd libevhtp/build; sudo make install)"
fi
fi
;;
esac