test kill valgrind process after run
This commit is contained in:
parent
d68a829862
commit
05ce6f38a3
28 changed files with 35 additions and 35 deletions
|
|
@ -541,7 +541,7 @@ main(int argc, char **argv)
|
||||||
cligen_tree_add(cli_cligen(h), treeref, pt);
|
cligen_tree_add(cli_cligen(h), treeref, pt);
|
||||||
|
|
||||||
if (printgen)
|
if (printgen)
|
||||||
cligen_print(stdout, pt, 1);
|
cligen_print(stdout, pt, 1); /* pt_print */
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Initialize cli syntax */
|
/* Initialize cli syntax */
|
||||||
|
|
|
||||||
|
|
@ -213,7 +213,7 @@ start_restconf(){
|
||||||
}
|
}
|
||||||
|
|
||||||
stop_restconf(){
|
stop_restconf(){
|
||||||
sudo pkill -u $wwwuser -f "$clixon_restconf"
|
sudo pkill -u $wwwuser -f clixon_restconf # Dont use $clixon_restoconf doesnt work in valgrind
|
||||||
if [ $valgrindtest -eq 3 ]; then
|
if [ $valgrindtest -eq 3 ]; then
|
||||||
sleep 1
|
sleep 1
|
||||||
checkvalgrind
|
checkvalgrind
|
||||||
|
|
|
||||||
|
|
@ -169,7 +169,7 @@ new "waiting"
|
||||||
wait_backend
|
wait_backend
|
||||||
|
|
||||||
new "kill old restconf daemon"
|
new "kill old restconf daemon"
|
||||||
sudo pkill -u $wwwuser clixon_restconf
|
sudo pkill -u $wwwuser -f clixon_restconf
|
||||||
|
|
||||||
new "start restconf daemon"
|
new "start restconf daemon"
|
||||||
start_restconf -f $cfg
|
start_restconf -f $cfg
|
||||||
|
|
|
||||||
|
|
@ -111,7 +111,7 @@ if [ $BE -ne 0 ]; then
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
err
|
err
|
||||||
fi
|
fi
|
||||||
sudo pkill clixon_backend # to be sure
|
sudo pkill -f clixon_backend # to be sure
|
||||||
|
|
||||||
new "start backend -s init -f $cfg"
|
new "start backend -s init -f $cfg"
|
||||||
start_backend -s init -f $cfg
|
start_backend -s init -f $cfg
|
||||||
|
|
@ -121,7 +121,7 @@ new "waiting"
|
||||||
wait_backend
|
wait_backend
|
||||||
|
|
||||||
new "kill old restconf daemon"
|
new "kill old restconf daemon"
|
||||||
sudo pkill -u $wwwuser clixon_restconf
|
sudo pkill -u $wwwuser -f clixon_restconf
|
||||||
|
|
||||||
new "start restconf daemon"
|
new "start restconf daemon"
|
||||||
start_restconf -f $cfg
|
start_restconf -f $cfg
|
||||||
|
|
|
||||||
|
|
@ -155,7 +155,7 @@ new "waiting"
|
||||||
wait_backend
|
wait_backend
|
||||||
|
|
||||||
new "kill old restconf daemon"
|
new "kill old restconf daemon"
|
||||||
sudo pkill -u $wwwuser clixon_restconf
|
sudo pkill -u $wwwuser -f clixon_restconf
|
||||||
|
|
||||||
new "start restconf daemon"
|
new "start restconf daemon"
|
||||||
start_restconf -f $cfg
|
start_restconf -f $cfg
|
||||||
|
|
|
||||||
|
|
@ -127,7 +127,7 @@ new "waiting"
|
||||||
wait_backend
|
wait_backend
|
||||||
|
|
||||||
new "kill old restconf daemon"
|
new "kill old restconf daemon"
|
||||||
sudo pkill -u $wwwuser clixon_restconf
|
sudo pkill -u $wwwuser -f clixon_restconf
|
||||||
|
|
||||||
new "start restconf daemon (-a is enable basic authentication)"
|
new "start restconf daemon (-a is enable basic authentication)"
|
||||||
start_restconf -f $cfg -- -a
|
start_restconf -f $cfg -- -a
|
||||||
|
|
|
||||||
|
|
@ -103,7 +103,7 @@ EOF
|
||||||
wait_backend
|
wait_backend
|
||||||
|
|
||||||
new "kill old restconf daemon"
|
new "kill old restconf daemon"
|
||||||
sudo pkill -u $wwwuser clixon_restconf
|
sudo pkill -u $wwwuser -f clixon_restconf
|
||||||
|
|
||||||
new "start restconf daemon (-a is enable basic authentication)"
|
new "start restconf daemon (-a is enable basic authentication)"
|
||||||
start_restconf -f $cfg -- -a
|
start_restconf -f $cfg -- -a
|
||||||
|
|
|
||||||
|
|
@ -147,7 +147,7 @@ new "waiting"
|
||||||
wait_backend
|
wait_backend
|
||||||
|
|
||||||
new "kill old restconf daemon"
|
new "kill old restconf daemon"
|
||||||
sudo pkill -u $wwwuser clixon_restconf
|
sudo pkill -u $wwwuser -f clixon_restconf
|
||||||
|
|
||||||
new "start restconf daemon (-a is enable http basic auth)"
|
new "start restconf daemon (-a is enable http basic auth)"
|
||||||
start_restconf -f $cfg -- -a
|
start_restconf -f $cfg -- -a
|
||||||
|
|
|
||||||
|
|
@ -141,7 +141,7 @@ new "waiting"
|
||||||
wait_backend
|
wait_backend
|
||||||
|
|
||||||
new "kill old restconf daemon"
|
new "kill old restconf daemon"
|
||||||
sudo pkill -u $wwwuser clixon_restconf
|
sudo pkill -u $wwwuser -f clixon_restconf
|
||||||
|
|
||||||
new "start restconf daemon (-a is enable basic authentication)"
|
new "start restconf daemon (-a is enable basic authentication)"
|
||||||
start_restconf -f $cfg -- -a
|
start_restconf -f $cfg -- -a
|
||||||
|
|
|
||||||
|
|
@ -149,7 +149,7 @@ new "waiting"
|
||||||
wait_backend
|
wait_backend
|
||||||
|
|
||||||
new "kill old restconf daemon"
|
new "kill old restconf daemon"
|
||||||
sudo pkill -u $wwwuser clixon_restconf
|
sudo pkill -u $wwwuser -f clixon_restconf
|
||||||
|
|
||||||
new "start restconf daemon (-a is enable basic authentication)"
|
new "start restconf daemon (-a is enable basic authentication)"
|
||||||
start_restconf -f $cfg -- -a
|
start_restconf -f $cfg -- -a
|
||||||
|
|
|
||||||
|
|
@ -150,7 +150,7 @@ new "waiting"
|
||||||
wait_backend
|
wait_backend
|
||||||
|
|
||||||
new "kill old restconf daemon"
|
new "kill old restconf daemon"
|
||||||
sudo pkill -u $wwwuser clixon_restconf
|
sudo pkill -u $wwwuser -f clixon_restconf
|
||||||
|
|
||||||
new "start restconf daemon (-a is enable basic authentication)"
|
new "start restconf daemon (-a is enable basic authentication)"
|
||||||
start_restconf -f $cfg -- -a
|
start_restconf -f $cfg -- -a
|
||||||
|
|
|
||||||
|
|
@ -83,7 +83,7 @@ new "waiting"
|
||||||
wait_backend
|
wait_backend
|
||||||
|
|
||||||
new "kill old restconf daemon"
|
new "kill old restconf daemon"
|
||||||
sudo pkill -u $wwwuser clixon_restconf
|
sudo pkill -u $wwwuser -f clixon_restconf
|
||||||
|
|
||||||
new "start restconf daemon"
|
new "start restconf daemon"
|
||||||
start_restconf -f $cfg
|
start_restconf -f $cfg
|
||||||
|
|
|
||||||
|
|
@ -61,7 +61,7 @@ new "waiting"
|
||||||
wait_backend
|
wait_backend
|
||||||
|
|
||||||
new "kill old restconf daemon"
|
new "kill old restconf daemon"
|
||||||
sudo pkill -u $wwwuser clixon_restconf
|
sudo pkill -u $wwwuser -f clixon_restconf
|
||||||
|
|
||||||
new "start restconf daemon"
|
new "start restconf daemon"
|
||||||
start_restconf -f $cfg
|
start_restconf -f $cfg
|
||||||
|
|
|
||||||
|
|
@ -60,7 +60,7 @@ testrun(){
|
||||||
err
|
err
|
||||||
fi
|
fi
|
||||||
# Kill all backends regardless of user or pid files (we mess with them in this test)
|
# Kill all backends regardless of user or pid files (we mess with them in this test)
|
||||||
sudo pkill clixon_backend
|
sudo pkill -f clixon_backend
|
||||||
|
|
||||||
# start backend as user
|
# start backend as user
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,7 @@ if [ $BE -ne 0 ]; then
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
err
|
err
|
||||||
fi
|
fi
|
||||||
sudo pkill clixon_backend # to be sure
|
sudo pkill -f clixon_backend # to be sure
|
||||||
new "start backend -s init -f $cfg -- -s"
|
new "start backend -s init -f $cfg -- -s"
|
||||||
start_backend -s init -f $cfg -- -s
|
start_backend -s init -f $cfg -- -s
|
||||||
fi
|
fi
|
||||||
|
|
@ -52,7 +52,7 @@ new "waiting"
|
||||||
wait_backend
|
wait_backend
|
||||||
|
|
||||||
new "kill old restconf daemon"
|
new "kill old restconf daemon"
|
||||||
sudo pkill -u $wwwuser clixon_restconf
|
sudo pkill -u $wwwuser -f clixon_restconf
|
||||||
|
|
||||||
new "start restconf daemon"
|
new "start restconf daemon"
|
||||||
start_restconf -f $cfg
|
start_restconf -f $cfg
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,7 @@ if [ $BE -ne 0 ]; then
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
err
|
err
|
||||||
fi
|
fi
|
||||||
sudo pkill clixon_backend # to be sure
|
sudo pkill -f clixon_backend # to be sure
|
||||||
new "start backend -s init -f $cfg"
|
new "start backend -s init -f $cfg"
|
||||||
start_backend -s init -f $cfg
|
start_backend -s init -f $cfg
|
||||||
fi
|
fi
|
||||||
|
|
@ -83,7 +83,7 @@ new "waiting"
|
||||||
wait_backend
|
wait_backend
|
||||||
|
|
||||||
new "kill old restconf daemon"
|
new "kill old restconf daemon"
|
||||||
sudo pkill -u $wwwuser clixon_restconf
|
sudo pkill -u $wwwuser -f clixon_restconf
|
||||||
|
|
||||||
new "start restconf daemon"
|
new "start restconf daemon"
|
||||||
start_restconf -f $cfg
|
start_restconf -f $cfg
|
||||||
|
|
|
||||||
|
|
@ -120,7 +120,7 @@ if [ $BE -ne 0 ]; then
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
err
|
err
|
||||||
fi
|
fi
|
||||||
sudo pkill clixon_backend # to be sure
|
sudo pkill -f clixon_backend # to be sure
|
||||||
new "start backend -s init -f $cfg"
|
new "start backend -s init -f $cfg"
|
||||||
start_backend -s init -f $cfg
|
start_backend -s init -f $cfg
|
||||||
fi
|
fi
|
||||||
|
|
@ -129,7 +129,7 @@ new "waiting"
|
||||||
wait_backend
|
wait_backend
|
||||||
|
|
||||||
new "kill old restconf daemon"
|
new "kill old restconf daemon"
|
||||||
sudo pkill -u $wwwuser clixon_restconf
|
sudo pkill -u $wwwuser -f clixon_restconf
|
||||||
|
|
||||||
new "start restconf daemon"
|
new "start restconf daemon"
|
||||||
start_restconf -f $cfg
|
start_restconf -f $cfg
|
||||||
|
|
|
||||||
|
|
@ -69,7 +69,7 @@ if [ $BE -ne 0 ]; then
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
err
|
err
|
||||||
fi
|
fi
|
||||||
sudo pkill clixon_backend # to be sure
|
sudo pkill -f clixon_backend # to be sure
|
||||||
new "start backend -s init -f $cfg -- -s"
|
new "start backend -s init -f $cfg -- -s"
|
||||||
start_backend -s init -f "$cfg" -- -s
|
start_backend -s init -f "$cfg" -- -s
|
||||||
fi
|
fi
|
||||||
|
|
@ -78,7 +78,7 @@ new "waiting"
|
||||||
wait_backend
|
wait_backend
|
||||||
|
|
||||||
new "kill old restconf daemon"
|
new "kill old restconf daemon"
|
||||||
sudo pkill -u $wwwuser clixon_restconf
|
sudo pkill -u $wwwuser -f clixon_restconf
|
||||||
|
|
||||||
new "start restconf daemon"
|
new "start restconf daemon"
|
||||||
start_restconf -f $cfg
|
start_restconf -f $cfg
|
||||||
|
|
|
||||||
|
|
@ -71,7 +71,7 @@ if [ $BE -ne 0 ]; then
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
err
|
err
|
||||||
fi
|
fi
|
||||||
sudo pkill clixon_backend # to be sure
|
sudo pkill -f clixon_backend # to be sure
|
||||||
|
|
||||||
new "start backend -s init -f $cfg"
|
new "start backend -s init -f $cfg"
|
||||||
start_backend -s init -f $cfg
|
start_backend -s init -f $cfg
|
||||||
|
|
@ -81,7 +81,7 @@ new "waiting"
|
||||||
wait_backend
|
wait_backend
|
||||||
|
|
||||||
new "kill old restconf daemon"
|
new "kill old restconf daemon"
|
||||||
sudo pkill -u $wwwuser clixon_restconf
|
sudo pkill -u $wwwuser -f clixon_restconf
|
||||||
|
|
||||||
new "start restconf daemon"
|
new "start restconf daemon"
|
||||||
start_restconf -f $cfg
|
start_restconf -f $cfg
|
||||||
|
|
|
||||||
|
|
@ -100,7 +100,7 @@ if [ $BE -ne 0 ]; then
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
err
|
err
|
||||||
fi
|
fi
|
||||||
sudo pkill clixon_backend # to be sure
|
sudo pkill -f clixon_backend # to be sure
|
||||||
new "start backend -s startup -f $cfg"
|
new "start backend -s startup -f $cfg"
|
||||||
start_backend -s startup -f $cfg
|
start_backend -s startup -f $cfg
|
||||||
fi
|
fi
|
||||||
|
|
@ -109,7 +109,7 @@ new "waiting"
|
||||||
wait_backend
|
wait_backend
|
||||||
|
|
||||||
new "kill old restconf daemon"
|
new "kill old restconf daemon"
|
||||||
sudo pkill -u $wwwuser clixon_restconf
|
sudo pkill -u $wwwuser -f clixon_restconf
|
||||||
|
|
||||||
new "start restconf daemon (-a is enable basic authentication)"
|
new "start restconf daemon (-a is enable basic authentication)"
|
||||||
start_restconf -f $cfg -- -a
|
start_restconf -f $cfg -- -a
|
||||||
|
|
|
||||||
|
|
@ -65,7 +65,7 @@ testrun(){
|
||||||
wait_backend
|
wait_backend
|
||||||
|
|
||||||
new "kill old restconf daemon"
|
new "kill old restconf daemon"
|
||||||
sudo pkill -u $wwwuser clixon_restconf
|
sudo pkill -u $wwwuser -f clixon_restconf
|
||||||
|
|
||||||
new "start restconf daemon"
|
new "start restconf daemon"
|
||||||
start_restconf -f $cfg -y $fyang $option
|
start_restconf -f $cfg -y $fyang $option
|
||||||
|
|
|
||||||
|
|
@ -47,7 +47,7 @@ new "waiting"
|
||||||
wait_backend
|
wait_backend
|
||||||
|
|
||||||
new "kill old restconf daemon"
|
new "kill old restconf daemon"
|
||||||
sudo pkill -u $wwwuser clixon_restconf
|
sudo pkill -u $wwwuser -f clixon_restconf
|
||||||
|
|
||||||
new "start restconf daemon"
|
new "start restconf daemon"
|
||||||
start_restconf -f $cfg
|
start_restconf -f $cfg
|
||||||
|
|
|
||||||
|
|
@ -118,7 +118,7 @@ new "waiting"
|
||||||
wait_backend
|
wait_backend
|
||||||
|
|
||||||
new "kill old restconf daemon"
|
new "kill old restconf daemon"
|
||||||
sudo pkill -u $wwwuser clixon_restconf
|
sudo pkill -u $wwwuser -f clixon_restconf
|
||||||
|
|
||||||
new "start restconf daemon"
|
new "start restconf daemon"
|
||||||
start_restconf -f $cfg
|
start_restconf -f $cfg
|
||||||
|
|
|
||||||
|
|
@ -163,7 +163,7 @@ new "waiting"
|
||||||
wait_backend
|
wait_backend
|
||||||
|
|
||||||
new "kill old restconf daemon"
|
new "kill old restconf daemon"
|
||||||
sudo pkill -u $wwwuser clixon_restconf
|
sudo pkill -u $wwwuser -f clixon_restconf
|
||||||
|
|
||||||
new "start restconf daemon"
|
new "start restconf daemon"
|
||||||
start_restconf -f $cfg
|
start_restconf -f $cfg
|
||||||
|
|
|
||||||
|
|
@ -259,7 +259,7 @@ new "waiting"
|
||||||
wait_backend
|
wait_backend
|
||||||
|
|
||||||
new "kill old restconf daemon"
|
new "kill old restconf daemon"
|
||||||
sudo pkill -u $wwwuser clixon_restconf
|
sudo pkill -u $wwwuser -f clixon_restconf
|
||||||
|
|
||||||
new "start restconf daemon"
|
new "start restconf daemon"
|
||||||
start_restconf -f $cfg
|
start_restconf -f $cfg
|
||||||
|
|
|
||||||
|
|
@ -270,7 +270,7 @@ testrun(){
|
||||||
wait_backend
|
wait_backend
|
||||||
|
|
||||||
new "kill old restconf daemon"
|
new "kill old restconf daemon"
|
||||||
sudo pkill -u $wwwuser clixon_restconf
|
sudo pkill -u $wwwuser -f clixon_restconf
|
||||||
|
|
||||||
new "start restconf daemon"
|
new "start restconf daemon"
|
||||||
start_restconf -f $cfg
|
start_restconf -f $cfg
|
||||||
|
|
|
||||||
|
|
@ -117,7 +117,7 @@ new "waiting"
|
||||||
wait_backend
|
wait_backend
|
||||||
|
|
||||||
new "kill old restconf daemon"
|
new "kill old restconf daemon"
|
||||||
sudo pkill -u $wwwuser clixon_restconf
|
sudo pkill -u $wwwuser -f clixon_restconf
|
||||||
|
|
||||||
new "start restconf daemon"
|
new "start restconf daemon"
|
||||||
start_restconf -f $cfg
|
start_restconf -f $cfg
|
||||||
|
|
|
||||||
|
|
@ -80,7 +80,7 @@ new "waiting"
|
||||||
wait_backend
|
wait_backend
|
||||||
|
|
||||||
new "kill old restconf daemon"
|
new "kill old restconf daemon"
|
||||||
sudo pkill -u $wwwuser clixon_restconf
|
sudo pkill -u $wwwuser -f clixon_restconf
|
||||||
|
|
||||||
new "start restconf daemon"
|
new "start restconf daemon"
|
||||||
start_restconf -f $cfg
|
start_restconf -f $cfg
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue