xpath parser scan strings instead of characters

This commit is contained in:
Olof hagsand 2019-04-02 11:01:01 +02:00
parent a68174897d
commit ed62c33a79
5 changed files with 10 additions and 12 deletions

View file

@ -41,7 +41,7 @@ module scaling{
EOF
cat <<EOF > $cfg
<config>
<clixon-config xmlns="http://clicon.org/config">
<CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
<CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
<CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
@ -53,7 +53,7 @@ cat <<EOF > $cfg
<CLICON_XMLDB_DIR>/usr/local/var/$APPNAME</CLICON_XMLDB_DIR>
<CLICON_XMLDB_PLUGIN>/usr/local/lib/xmldb/text.so</CLICON_XMLDB_PLUGIN>
<CLICON_XMLDB_PRETTY>false</CLICON_XMLDB_PRETTY>
</config>
</clixon-config>
EOF
new "test params: -f $cfg -y $fyang"

View file

@ -1,7 +1,6 @@
#!/bin/bash
# Run valgrind leak test for cli, restconf, netconf or background.
# Stop on first error
# Run valgrindtest once, args:
# what: cli|netconf|restconf|backend
@ -24,7 +23,7 @@ memonce(){
;;
'backend')
valgrindtest=2 # This means backend valgrind test
: ${RCWAIT:=5} # valgrind backend needs some time to get up
: ${RCWAIT:=10} # valgrind backend needs some time to get up
perfnr=100 # test_perf.sh restconf put more or less stops
perfreq=10

View file

@ -89,7 +89,6 @@ expectfn "$clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/stand
files=$(find $YANGMODELS/vendor/juniper/18.2/18.2R1/junos/conf -name "*.yang")
let i=0;
for f in $files; do
echo "f:$f"
if [ -n "$(head -5 $f|grep '^ module')" ]; then
new "$clixon_cli -1f $cfg -o CLICON_YANG_MAIN_FILE=$f -p $YANGMODELS/vendor/juniper/18.2/18.2R1/common -p $YANGMODELS/vendor/juniper/18.2/18.2R1/junos/conf show version"
expectfn "$clixon_cli -1f $cfg -o CLICON_YANG_MAIN_FILE=$f -p $YANGMODELS/vendor/juniper/18.2/18.2R1/common -p $YANGMODELS/vendor/juniper/18.2/18.2R1/junos/conf -o CLICON_CLI_GENMODEL=0 show version" 0 "3."