diff --git a/test/lib.sh b/test/lib.sh index 10d196cd..616c7837 100755 --- a/test/lib.sh +++ b/test/lib.sh @@ -201,11 +201,15 @@ BUSER=clicon : ${_ALREADY_HERE:=0} if [ -n "$CLICON_GROUP" ] && [ $_ALREADY_HERE -eq 0 ]; then - clixon_cli="sudo -g ${CLICON_GROUP} $clixon_cli" - clixon_netconf="sudo -g ${CLICON_GROUP} $clixon_netconf" - clixon_restconf="sudo -g ${CLICON_GROUP} $clixon_restconf" - clixon_snmp="sudo -g ${CLICON_GROUP} --preserve-env=MIBDIRS $clixon_snmp" - clixon_util_socket="sudo -g ${CLICON_GROUP} $clixon_util_socket" + # Extra test for some archs, ie ubuntu 18 that have problems with this + sudo -g ${CLICON_GROUP} $clixon_netconf 2> /dev/null + if [ $? -eq 0 ]; then + clixon_cli="sudo -g ${CLICON_GROUP} $clixon_cli" + clixon_netconf="sudo -g ${CLICON_GROUP} $clixon_netconf" + clixon_restconf="sudo -g ${CLICON_GROUP} $clixon_restconf" + clixon_snmp="sudo -g ${CLICON_GROUP} --preserve-env=MIBDIRS $clixon_snmp" + clixon_util_socket="sudo -g ${CLICON_GROUP} $clixon_util_socket" + fi fi _ALREADY_HERE=1 diff --git a/test/test_config_dump.sh b/test/test_config_dump.sh index 6dfe9659..f8f4086a 100755 --- a/test/test_config_dump.sh +++ b/test/test_config_dump.sh @@ -55,6 +55,16 @@ module example { } EOF +if [ $BE -ne 0 ]; then + # kill old backend (if any) + new "kill old backend" + sudo clixon_backend -zf $cfg + if [ $? -ne 0 ]; then + err + fi +fi + + # Extra cmdline opts, first is overwritten, second appended CMDOPTS='-o CLICON_MODULE_SET=42 -o CLICON_FEATURE="cmdline"' diff --git a/test/vagrant/clixon.sh b/test/vagrant/clixon.sh index d5765808..e7b59bf2 100755 --- a/test/vagrant/clixon.sh +++ b/test/vagrant/clixon.sh @@ -75,17 +75,18 @@ sudo $MAKE install (cd example; sudo $MAKE install) sudo ldconfig - # Clixon-util +cd test -d src/clixon-util || (cd src;git clone https://github.com/clicon/clixon-util.git) -cd src/clixon -git pull origin master +cd src/clixon-util +git pull origin main ./configure --with-cligen=/ --with-clixon=/ $MAKE clean $MAKE -j10 sudo $MAKE install -cd test +cd +cd src/clixon/test echo "#!/usr/bin/env bash" > ./site.sh echo "IPv6=true" >> ./site.sh if [ $release = "freebsd" -o $release = "dragonfly" ]; then