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

Merge pull request #418 from kernelkit/kkit

Browse source 
Misc. build fixes encountered when cross-compiling
This commit is contained in:
Olof Hagsand 2023-02-17 09:52:42 +01:00 • committed by GitHub
commit ecd60fbcfe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 141 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/lib.sh
View file

@ -554,7 +554,7 @@ function stop_backend(){
sleep 1
checkvalgrind
fi
sudo pkill -f clixon_backend # extra ($BUSER?)
# sudo pkill -f clixon_backend # extra ($BUSER?)
}
# Wait for restconf to stop sending 502 Bad Gateway
@ -638,7 +638,7 @@ function wait_restconf(){
sleep 2 # some problems with valgrind
fi
stty $STTYSETTINGS
stty $STTYSETTINGS >/dev/null
}
# Wait for restconf to stop

3
test/test_restconf_internal.sh
View file

@ -115,7 +115,7 @@ EOF
err "No pid return value" "$retx"
fi
if $active; then
expect="^<rpc-reply $DEFAULTNS><active $LIBNS>$active</active><description $LIBNS>Clixon RESTCONF process</description><command $LIBNS>/.*/clixon_restconf -f $cfg -D [0-9] .*</command><status $LIBNS>$status</status><starttime $LIBNS>20[0-9][0-9]\-[0-9][0-9]\-[0-9][0-9]T[0-9][0-9]:[0-9][0-9]:[0-9][0-9]\.[0-9]*Z</starttime><pid $LIBNS>$pid</pid></rpc-reply>$"
expect="^<rpc-reply $DEFAULTNS><active $LIBNS>$active</active><description $LIBNS>Clixon RESTCONF process</description><command $LIBNS>/.*/clixon_restconf -f $cfg -D [0-9] .*</command><status $LIBNS>$status</status><starttime $LIBNS>20[0-9][0-9]-[0-9][0-9]-[0-9][0-9]T[0-9][0-9]:[0-9][0-9]:[0-9][0-9]\.[0-9]*Z</starttime><pid $LIBNS>$pid</pid></rpc-reply>$"
else
# inactive, no startime or pid
expect="^<rpc-reply $DEFAULTNS><active $LIBNS>$active</active><description $LIBNS>Clixon RESTCONF process</description><command $LIBNS>/.*/clixon_restconf -f $cfg -D [0-9] .*</command><status $LIBNS>$status</status></rpc-reply>$"
@ -320,6 +320,7 @@ if [ $BE -ne 0 ]; then
fi
# kill backend
stop_backend -f $cfg
killall clixon_restconf
fi
# Restconf is enabled and restconf was running but was killed by stop ^.