From 734f65e25ac267b2dde88b898e4bbf771df99f71 Mon Sep 17 00:00:00 2001
From: Olof Hagsand <olof@hagsand.org>
Date: Sun, 13 Oct 2019 07:04:05 -1000
Subject: [PATCH] freebsd test script modifications

---
 test/README.md                  |  6 ++++++
 test/lib.sh                     | 21 +++++++++++----------
 test/test_choice.sh             |  2 +-
 test/test_identity.sh           |  2 +-
 test/test_nacm.sh               |  2 +-
 test/test_nacm_default.sh       |  2 +-
 test/test_nacm_ext.sh           |  2 +-
 test/test_nacm_module_read.sh   |  2 +-
 test/test_nacm_module_write.sh  |  2 +-
 test/test_nacm_protocol.sh      |  2 +-
 test/test_perf.sh               |  2 +-
 test/test_perf_state.sh         |  2 +-
 test/test_restconf.sh           |  2 +-
 test/test_restconf2.sh          |  2 +-
 test/test_restconf_err.sh       |  2 +-
 test/test_restconf_jukebox.sh   |  2 +-
 test/test_restconf_listkey.sh   |  2 +-
 test/test_restconf_patch.sh     |  2 +-
 test/test_restconf_startup.sh   |  2 +-
 test/test_rpc.sh                |  2 +-
 test/test_stream.sh             |  2 +-
 test/test_submodule.sh          |  2 +-
 test/test_upgrade_auto.sh       |  2 +-
 test/test_upgrade_interfaces.sh |  2 +-
 test/test_upgrade_repair.sh     |  2 +-
 test/test_yang_namespace.sh     |  2 +-
 26 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/test/README.md b/test/README.md
index 809f00db..5cc925c5 100644
--- a/test/README.md
+++ b/test/README.md
@@ -78,3 +78,9 @@ You may add your site-specific modifications in a `site.sh` file. Example:
   IETFRFC=$YANGMODELS/standard/ietf/RFC
 ```
 
+## FreeBSD
+
+To run on freebsd:
+```
+wwwuser=www clixon_restconf=/usr/local/sbin/clixon_restconf ./all.sh
+```
\ No newline at end of file
diff --git a/test/lib.sh b/test/lib.sh
index fa601e19..87f3d8fb 100755
--- a/test/lib.sh
+++ b/test/lib.sh
@@ -190,7 +190,7 @@ stop_backend(){
 
 # Wait for restconf to stop sending  502 Bad Gateway
 wait_backend(){
-    reply=$(echo '<rpc message-id="101"><ping xmlns="http://clicon.org/lib"/></rpc>]]>]]>' | clixon_netconf -qef $cfg 2> /dev/null) 
+    reply=$(echo '<rpc message-id="101"><ping xmlns="http://clicon.org/lib"/></rpc>]]>]]>' | $clixon_netconf -qef $cfg 2> /dev/null) 
     let i=0;
     while [[ $reply != "<rpc-reply"* ]]; do
 	sleep 1
@@ -205,14 +205,14 @@ wait_backend(){
 
 start_restconf(){
     # Start in background 
-    sudo su -c "$clixon_restconf $RCLOG -D $DBG $*" -s /bin/sh www-data &
+    sudo -u $wwwuser -s $clixon_restconf $RCLOG -D $DBG $* &
     if [ $? -ne 0 ]; then
 	err
     fi
 }
 
 stop_restconf(){
-    sudo pkill -u www-data -f "/www-data/clixon_restconf"
+    sudo pkill -u $wwwuser -f "$clixon_restconf"
     if [ $valgrindtest -eq 3 ]; then 
 	sleep 1
 	checkvalgrind
@@ -292,7 +292,7 @@ expectfn(){
     let i=0;
     for exp in "$@"; do
 	if [ $i -gt 1 ]; then
-	    match=`echo $ret | grep -EZo "$exp"`
+	    match=`echo $ret | grep --null -Eo "$exp"`
 	    if [ -z "$match" ]; then
 		err "$exp" "$ret"
 	    fi
@@ -357,7 +357,7 @@ expectpart(){
   for exp in "$@"; do
        if [ $i -gt 1 ]; then
 #      echo "exp:$exp"
-	  match=`echo $ret | grep -Zo "$exp"` # XXX -EZo: -E cant handle {}
+	  match=`echo $ret | grep --null -o "$exp"` # XXX -EZo: -E cant handle {}
 	  if [ -z "$match" ]; then
 	      err "$exp" "$ret"
 	  fi
@@ -403,12 +403,13 @@ EOF
       return
   fi
   # -G for basic regexp (eg ^$). -E for extended regular expression - differs in \
-  # -Z for nul character, -x for implicit ^$ -q for quiet
+  # --null for nul character, -x for implicit ^$ -q for quiet
   # -o only matching
-  # Two variants: -EZo and -Fxq
-  #  match=`echo "$ret" | grep -FZo "$expect"`
-  r=$(echo "$ret" | grep -GZo "$expect")
+  # Two variants: --null -Eo and -Fxq
+  #  match=`echo "$ret" | grep --null -Fo "$expect"`
+  r=$(echo "$ret" | grep --null -Go "$expect")
   match=$?
+
 #  echo "r:\"$r\""
 #  echo "ret:\"$ret\""
 #  echo "expect:\"$expect\""
@@ -564,7 +565,7 @@ expectmatch(){
 	    err "$expect" "$ret"
 	fi
 	if [ -n "$expect2" ]; then
-	    match=`echo "$ret" | grep -EZo "$expect2"`
+	    match=`echo "$ret" | grep --null -Eo "$expect2"`
 	    if [ -z "$match" ]; then
 		err $expect "$ret"
 	    fi
diff --git a/test/test_choice.sh b/test/test_choice.sh
index 58a68b1b..cfa68953 100755
--- a/test/test_choice.sh
+++ b/test/test_choice.sh
@@ -118,7 +118,7 @@ if [ $BE -ne 0 ]; then
 fi
 
 new "kill old restconf daemon"
-sudo pkill -u www-data clixon_restconf
+sudo pkill -u $wwwuser clixon_restconf
 
 new "start restconf daemon"
 start_restconf -f $cfg
diff --git a/test/test_identity.sh b/test/test_identity.sh
index a69a537d..631e4a35 100755
--- a/test/test_identity.sh
+++ b/test/test_identity.sh
@@ -153,7 +153,7 @@ if [ $BE -ne 0 ]; then
 fi
 
 new "kill old restconf daemon"
-sudo pkill -u www-data clixon_restconf
+sudo pkill -u $wwwuser clixon_restconf
 
 new "start restconf daemon"
 start_restconf -f $cfg
diff --git a/test/test_nacm.sh b/test/test_nacm.sh
index 7e5a0e41..a7bacde9 100755
--- a/test/test_nacm.sh
+++ b/test/test_nacm.sh
@@ -122,7 +122,7 @@ if [ $BE -ne 0 ]; then
 fi
 
 new "kill old restconf daemon"
-sudo pkill -u www-data -f "/www-data/clixon_restconf"
+sudo pkill -u $wwwuser clixon_restconf
 
 new "start restconf daemon (-a is enable basic authentication)"
 start_restconf -f $cfg -- -a
diff --git a/test/test_nacm_default.sh b/test/test_nacm_default.sh
index f76e9ad6..f2bedf80 100755
--- a/test/test_nacm_default.sh
+++ b/test/test_nacm_default.sh
@@ -99,7 +99,7 @@ EOF
     fi
     
     new "kill old restconf daemon"
-    sudo pkill -u www-data -f "/www-data/clixon_restconf"
+    sudo pkill -u $wwwuser clixon_restconf
 
     new "start restconf daemon (-a is enable basic authentication)"
     start_restconf -f $cfg -- -a
diff --git a/test/test_nacm_ext.sh b/test/test_nacm_ext.sh
index bc506b5b..2501796d 100755
--- a/test/test_nacm_ext.sh
+++ b/test/test_nacm_ext.sh
@@ -143,7 +143,7 @@ if [ $BE -ne 0 ]; then
 fi
 
 new "kill old restconf daemon"
-sudo pkill -u www-data -f "/www-data/clixon_restconf"
+sudo pkill -u $wwwuser clixon_restconf
 
 new "start restconf daemon (-a is enable http basic auth)"
 start_restconf -f $cfg -- -a
diff --git a/test/test_nacm_module_read.sh b/test/test_nacm_module_read.sh
index 636f43f3..416095e0 100755
--- a/test/test_nacm_module_read.sh
+++ b/test/test_nacm_module_read.sh
@@ -137,7 +137,7 @@ if [ $BE -ne 0 ]; then
 fi
 
 new "kill old restconf daemon"
-sudo pkill -u www-data -f "/www-data/clixon_restconf"
+sudo pkill -u $wwwuser clixon_restconf
 
 new "start restconf daemon (-a is enable basic authentication)"
 start_restconf -f $cfg -- -a
diff --git a/test/test_nacm_module_write.sh b/test/test_nacm_module_write.sh
index d940343c..06804480 100755
--- a/test/test_nacm_module_write.sh
+++ b/test/test_nacm_module_write.sh
@@ -145,7 +145,7 @@ if [ $BE -ne 0 ]; then
 fi
 
 new "kill old restconf daemon"
-sudo pkill -u www-data -f "/www-data/clixon_restconf"
+sudo pkill -u $wwwuser clixon_restconf
 
 new "start restconf daemon (-a is enable basic authentication)"
 start_restconf -f $cfg -- -a
diff --git a/test/test_nacm_protocol.sh b/test/test_nacm_protocol.sh
index 3c70bdd6..0666329f 100755
--- a/test/test_nacm_protocol.sh
+++ b/test/test_nacm_protocol.sh
@@ -146,7 +146,7 @@ if [ $BE -ne 0 ]; then
 fi
 
 new "kill old restconf daemon"
-sudo pkill -u www-data -f "/www-data/clixon_restconf"
+sudo pkill -u $wwwuser clixon_restconf
 
 new "start restconf daemon (-a is enable basic authentication)"
 start_restconf -f $cfg -- -a
diff --git a/test/test_perf.sh b/test/test_perf.sh
index 33c1c70d..9d5474c7 100755
--- a/test/test_perf.sh
+++ b/test/test_perf.sh
@@ -80,7 +80,7 @@ if [ $BE -ne 0 ]; then
 fi
 
 new "kill old restconf daemon"
-sudo pkill -u www-data -f "/www-data/clixon_restconf"
+sudo pkill -u $wwwuser clixon_restconf
 
 new "start restconf daemon"
 start_restconf -f $cfg
diff --git a/test/test_perf_state.sh b/test/test_perf_state.sh
index f6905f6b..417136f4 100755
--- a/test/test_perf_state.sh
+++ b/test/test_perf_state.sh
@@ -58,7 +58,7 @@ if [ $BE -ne 0 ]; then
 fi
 
 new "kill old restconf daemon"
-sudo pkill -u www-data -f "/www-data/clixon_restconf"
+sudo pkill -u $wwwuser clixon_restconf
 
 new "start restconf daemon"
 start_restconf -f $cfg
diff --git a/test/test_restconf.sh b/test/test_restconf.sh
index ed3b0fdd..7c7dfbc7 100755
--- a/test/test_restconf.sh
+++ b/test/test_restconf.sh
@@ -49,7 +49,7 @@ if [ $BE -ne 0 ]; then
 fi
 
 new "kill old restconf daemon"
-sudo pkill -u www-data clixon_restconf
+sudo pkill -u $wwwuser clixon_restconf
 
 new "start restconf daemon"
 start_restconf -f $cfg
diff --git a/test/test_restconf2.sh b/test/test_restconf2.sh
index 8191c666..18afb0db 100755
--- a/test/test_restconf2.sh
+++ b/test/test_restconf2.sh
@@ -80,7 +80,7 @@ if [ $BE -ne 0 ]; then
 fi
 
 new "kill old restconf daemon"
-sudo pkill -u www-data -f "/www-data/clixon_restconf"
+sudo pkill -u $wwwuser clixon_restconf
 
 new "start restconf daemon"
 start_restconf -f $cfg
diff --git a/test/test_restconf_err.sh b/test/test_restconf_err.sh
index d2adc269..4a59d929 100755
--- a/test/test_restconf_err.sh
+++ b/test/test_restconf_err.sh
@@ -126,7 +126,7 @@ if [ $BE -ne 0 ]; then
 fi
 
 new "kill old restconf daemon"
-sudo pkill -u www-data -f "/www-data/clixon_restconf"
+sudo pkill -u $wwwuser clixon_restconf
 
 new "start restconf daemon"
 start_restconf -f $cfg
diff --git a/test/test_restconf_jukebox.sh b/test/test_restconf_jukebox.sh
index 82f2a919..4ce3e137 100755
--- a/test/test_restconf_jukebox.sh
+++ b/test/test_restconf_jukebox.sh
@@ -75,7 +75,7 @@ if [ $BE -ne 0 ]; then
 fi
 
 new "kill old restconf daemon"
-sudo pkill -u www-data -f "/www-data/clixon_restconf"
+sudo pkill -u $wwwuser clixon_restconf
 
 new "start restconf daemon"
 start_restconf -f $cfg
diff --git a/test/test_restconf_listkey.sh b/test/test_restconf_listkey.sh
index 3e3a7db6..7d1baead 100755
--- a/test/test_restconf_listkey.sh
+++ b/test/test_restconf_listkey.sh
@@ -78,7 +78,7 @@ if [ $BE -ne 0 ]; then
 fi
 
 new "kill old restconf daemon"
-sudo pkill -u www-data -f "/www-data/clixon_restconf"
+sudo pkill -u $wwwuser clixon_restconf
 
 new "start restconf daemon"
 start_restconf -f $cfg
diff --git a/test/test_restconf_patch.sh b/test/test_restconf_patch.sh
index 728ba7f3..7094d4d0 100755
--- a/test/test_restconf_patch.sh
+++ b/test/test_restconf_patch.sh
@@ -106,7 +106,7 @@ if [ $BE -ne 0 ]; then
 fi
 
 new "kill old restconf daemon"
-sudo pkill -u www-data -f "/www-data/clixon_restconf"
+sudo pkill -u $wwwuser clixon_restconf
 
 new "start restconf daemon (-a is enable basic authentication)"
 start_restconf -f $cfg -- -a 
diff --git a/test/test_restconf_startup.sh b/test/test_restconf_startup.sh
index 7b8f3e3b..b6d1a92e 100755
--- a/test/test_restconf_startup.sh
+++ b/test/test_restconf_startup.sh
@@ -62,7 +62,7 @@ testrun(){
     fi
     
     new "kill old restconf daemon"
-    sudo pkill -u www-data clixon_restconf
+    sudo pkill -u $wwwuser clixon_restconf
     
     new "start restconf daemon"
     start_restconf -f $cfg -y $fyang $option
diff --git a/test/test_rpc.sh b/test/test_rpc.sh
index a598350b..e952dc1c 100755
--- a/test/test_rpc.sh
+++ b/test/test_rpc.sh
@@ -44,7 +44,7 @@ if [ $BE -ne 0 ]; then
 fi
 
 new "kill old restconf daemon"
-sudo pkill -u www-data clixon_restconf
+sudo pkill -u $wwwuser clixon_restconf
 
 new "start restconf daemon"
 start_restconf -f $cfg
diff --git a/test/test_stream.sh b/test/test_stream.sh
index b54895fb..3ae04087 100755
--- a/test/test_stream.sh
+++ b/test/test_stream.sh
@@ -115,7 +115,7 @@ if [ $BE -ne 0 ]; then
 fi
 
 new "kill old restconf daemon"
-sudo pkill -u www-data -f "/www-data/clixon_restconf"
+sudo pkill -u $wwwuser clixon_restconf
       
 new "start restconf daemon"
 start_restconf -f $cfg
diff --git a/test/test_submodule.sh b/test/test_submodule.sh
index 9a3c0502..9a3b2182 100755
--- a/test/test_submodule.sh
+++ b/test/test_submodule.sh
@@ -160,7 +160,7 @@ if [ $BE -ne 0 ]; then
 fi
 
 new "kill old restconf daemon"
-sudo pkill -u www-data clixon_restconf
+sudo pkill -u $wwwuser clixon_restconf
 
 new "start restconf daemon"
 start_restconf -f $cfg
diff --git a/test/test_upgrade_auto.sh b/test/test_upgrade_auto.sh
index 9fe2b970..bf0f3798 100755
--- a/test/test_upgrade_auto.sh
+++ b/test/test_upgrade_auto.sh
@@ -256,7 +256,7 @@ if [ $BE -ne 0 ]; then
 fi
 
 new "kill old restconf daemon"
-sudo pkill -u www-data clixon_restconf
+sudo pkill -u $wwwuser clixon_restconf
 
 new "start restconf daemon"
 start_restconf -f $cfg
diff --git a/test/test_upgrade_interfaces.sh b/test/test_upgrade_interfaces.sh
index cca868cb..a45453dc 100755
--- a/test/test_upgrade_interfaces.sh
+++ b/test/test_upgrade_interfaces.sh
@@ -267,7 +267,7 @@ testrun(){
     fi
 
     new "kill old restconf daemon"
-    sudo pkill -u www-data clixon_restconf
+    sudo pkill -u $wwwuser clixon_restconf
 
     new "start restconf daemon"
     start_restconf -f $cfg
diff --git a/test/test_upgrade_repair.sh b/test/test_upgrade_repair.sh
index ce8871d5..6e449342 100755
--- a/test/test_upgrade_repair.sh
+++ b/test/test_upgrade_repair.sh
@@ -114,7 +114,7 @@ if [ $BE -ne 0 ]; then
 fi
 
 new "kill old restconf daemon"
-sudo pkill -u www-data clixon_restconf
+sudo pkill -u $wwwuser clixon_restconf
 
 new "start restconf daemon"
 start_restconf -f $cfg
diff --git a/test/test_yang_namespace.sh b/test/test_yang_namespace.sh
index 935920cd..98926f91 100755
--- a/test/test_yang_namespace.sh
+++ b/test/test_yang_namespace.sh
@@ -77,7 +77,7 @@ if [ $BE -ne 0 ]; then
 fi
 
 new "kill old restconf daemon"
-sudo pkill -u www-data clixon_restconf
+sudo pkill -u $wwwuser clixon_restconf
 
 new "start restconf daemon"
 start_restconf -f $cfg