diff --git a/test/plot_perf.sh b/test/plot_perf.sh index 96f25eef2..7001d99f0 100755 --- a/test/plot_perf.sh +++ b/test/plot_perf.sh @@ -89,8 +89,8 @@ cat < $cfg $dir /usr/local/share/clixon $fyang - /usr/local/var/example/example.sock - /usr/local/var/example/example.pidfile + /usr/local/var/$APPNAME.sock + /usr/local/var/$APPNAME.pidfile $dir false false diff --git a/test/test_datastore_repair.sh b/test/test_datastore_repair.sh index dfa2cf416..d16aac4e8 100755 --- a/test/test_datastore_repair.sh +++ b/test/test_datastore_repair.sh @@ -22,7 +22,7 @@ cat < $cfg ${YANG_INSTALLDIR} $dir /usr/local/var/run/$APPNAME.sock - /usr/local/lib/example/backend + /usr/local/lib/$APPNAME/backend /usr/local/var/run/$APPNAME.pidfile $dir true diff --git a/test/test_order.sh b/test/test_order.sh index 4b386e8f5..b9274f41c 100755 --- a/test/test_order.sh +++ b/test/test_order.sh @@ -39,7 +39,7 @@ cat < $cfg /usr/local/lib/$APPNAME/cli $APPNAME /usr/local/var/run/$APPNAME.sock - /usr/local/lib/example/backend + /usr/local/lib/$APPNAME/backend /usr/local/var/run/$APPNAME.pidfile $dbdir $format diff --git a/test/test_perf_cli.sh b/test/test_perf_cli.sh index 4b4221565..e558e8a92 100755 --- a/test/test_perf_cli.sh +++ b/test/test_perf_cli.sh @@ -59,13 +59,13 @@ cat < $cfg ${YANG_INSTALLDIR} $fyang /usr/local/var/run/$APPNAME.sock - /usr/local/var/example/run/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile $dir false $format example - /usr/local/lib/example/cli - /usr/local/lib/example/clispec + /usr/local/lib/$APPNAME/cli + /usr/local/lib/$APPNAME/clispec 0 ietf-netconf:startup diff --git a/test/test_perf_netconf.sh b/test/test_perf_netconf.sh index 8234f4a9d..1a65cfef9 100755 --- a/test/test_perf_netconf.sh +++ b/test/test_perf_netconf.sh @@ -63,13 +63,13 @@ cat < $cfg ${YANG_INSTALLDIR} $fyang /usr/local/var/run/$APPNAME.sock - /usr/local/var/example/run/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile $dir false $format example - /usr/local/lib/example/cli - /usr/local/lib/example/clispec + /usr/local/lib/$APPNAME/cli + /usr/local/lib/$APPNAME/clispec 0 ietf-netconf:startup diff --git a/test/test_perf_restconf.sh b/test/test_perf_restconf.sh index be5fdc668..de49e4520 100755 --- a/test/test_perf_restconf.sh +++ b/test/test_perf_restconf.sh @@ -77,13 +77,13 @@ cat < $cfg ${YANG_INSTALLDIR} $fyang /usr/local/var/run/$APPNAME.sock - /usr/local/var/example/run/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile $dir false $format example - /usr/local/lib/example/cli - /usr/local/lib/example/clispec + /usr/local/lib/$APPNAME/cli + /usr/local/lib/$APPNAME/clispec 0 128 true diff --git a/test/test_perf_restconf_ssl.sh b/test/test_perf_restconf_ssl.sh index 1ece3e5d8..dcfcaade1 100755 --- a/test/test_perf_restconf_ssl.sh +++ b/test/test_perf_restconf_ssl.sh @@ -93,13 +93,13 @@ cat < $cfg ${YANG_INSTALLDIR} $fyang /usr/local/var/run/$APPNAME.sock - /usr/local/var/example/run/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile $dir false $format example - /usr/local/lib/example/cli - /usr/local/lib/example/clispec + /usr/local/lib/$APPNAME/cli + /usr/local/lib/$APPNAME/clispec 0 128 true diff --git a/test/test_perf_startup.sh b/test/test_perf_startup.sh index d410e40bb..6e14bd761 100755 --- a/test/test_perf_startup.sh +++ b/test/test_perf_startup.sh @@ -59,12 +59,12 @@ cat < $cfg ${YANG_INSTALLDIR} $fyang /usr/local/var/run/$APPNAME.sock - /usr/local/var/example/run/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile $dir false example - /usr/local/lib/example/cli - /usr/local/lib/example/clispec + /usr/local/lib/$APPNAME/cli + /usr/local/lib/$APPNAME/clispec 0 ietf-netconf:startup diff --git a/test/test_perf_state.sh b/test/test_perf_state.sh index 16e924db4..a66fa17a7 100755 --- a/test/test_perf_state.sh +++ b/test/test_perf_state.sh @@ -39,15 +39,15 @@ cat < $cfg ${YANG_INSTALLDIR} $fyang /usr/local/var/run/$APPNAME.sock - /usr/local/var/example/run/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile /usr/local/lib/$APPNAME/backend example_backend.so$ $dir false $format example - /usr/local/lib/example/cli - /usr/local/lib/example/clispec + /usr/local/lib/$APPNAME/cli + /usr/local/lib/$APPNAME/clispec 0 ietf-netconf:startup true diff --git a/test/test_perf_state_only.sh b/test/test_perf_state_only.sh index 7b4bc65a1..5b160441e 100755 --- a/test/test_perf_state_only.sh +++ b/test/test_perf_state_only.sh @@ -38,15 +38,15 @@ cat < $cfg ${YANG_INSTALLDIR} $fyang /usr/local/var/run/$APPNAME.sock - /usr/local/var/example/run/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile /usr/local/lib/$APPNAME/backend example_backend.so$ $dir false $format example - /usr/local/lib/example/cli - /usr/local/lib/example/clispec + /usr/local/lib/$APPNAME/cli + /usr/local/lib/$APPNAME/clispec ietf-netconf:startup true $RESTCONFIG diff --git a/test/test_privileges.sh b/test/test_privileges.sh index 4bcfb02ac..cda81c8b4 100755 --- a/test/test_privileges.sh +++ b/test/test_privileges.sh @@ -27,8 +27,8 @@ cat < $cfg $cfg ${YANG_INSTALLDIR} $fyang - $dir/$APPNAME.sock - /var/tmp/run/$APPNAME.pidfile + /var/run/$APPNAME.sock + /var/run/$APPNAME.pidfile $dir EOF diff --git a/test/test_upgrade_auto.sh b/test/test_upgrade_auto.sh index cf6cff76b..28094c159 100755 --- a/test/test_upgrade_auto.sh +++ b/test/test_upgrade_auto.sh @@ -179,7 +179,7 @@ cat < $cfg ${YANG_INSTALLDIR} $dir /usr/local/var/run/$APPNAME.sock - /usr/local/lib/example/backend + /usr/local/lib/$APPNAME/backend /usr/local/var/run/$APPNAME.pidfile $dir true diff --git a/test/test_upgrade_checkold.sh b/test/test_upgrade_checkold.sh index e79eacfa7..8df856bc4 100755 --- a/test/test_upgrade_checkold.sh +++ b/test/test_upgrade_checkold.sh @@ -27,7 +27,7 @@ cat < $cfg ${YANG_INSTALLDIR} $dir /usr/local/var/run/$APPNAME.sock - /usr/local/lib/example/backend + /usr/local/lib/$APPNAME/backend /usr/local/var/run/$APPNAME.pidfile true $changelog diff --git a/test/test_upgrade_failsafe.sh b/test/test_upgrade_failsafe.sh index 3e1bd9f28..e9ff3c469 100755 --- a/test/test_upgrade_failsafe.sh +++ b/test/test_upgrade_failsafe.sh @@ -101,7 +101,7 @@ cat < $cfg $dir $dir /usr/local/var/run/$APPNAME.sock - /usr/local/lib/example/backend + /usr/local/lib/$APPNAME/backend /usr/local/var/run/$APPNAME.pidfile $dir true diff --git a/test/test_upgrade_interfaces.sh b/test/test_upgrade_interfaces.sh index 0fecffe25..8b65b5d52 100755 --- a/test/test_upgrade_interfaces.sh +++ b/test/test_upgrade_interfaces.sh @@ -39,7 +39,7 @@ cat < $cfg $dir $dir /usr/local/var/run/$APPNAME.sock - /usr/local/lib/example/backend + /usr/local/lib/$APPNAME/backend /usr/local/var/run/$APPNAME.pidfile $dir true diff --git a/test/test_upgrade_interfaces_rfc7895.sh b/test/test_upgrade_interfaces_rfc7895.sh index 885e52273..09b2d2fff 100755 --- a/test/test_upgrade_interfaces_rfc7895.sh +++ b/test/test_upgrade_interfaces_rfc7895.sh @@ -39,7 +39,7 @@ cat < $cfg $dir $dir /usr/local/var/run/$APPNAME.sock - /usr/local/lib/example/backend + /usr/local/lib/$APPNAME/backend /usr/local/var/run/$APPNAME.pidfile $dir true diff --git a/test/test_upgrade_module.sh b/test/test_upgrade_module.sh index fc334108a..5b1eab693 100755 --- a/test/test_upgrade_module.sh +++ b/test/test_upgrade_module.sh @@ -61,7 +61,7 @@ cat < $cfg ${YANG_INSTALLDIR} $dir /usr/local/var/run/$APPNAME.sock - /usr/local/lib/example/backend + /usr/local/lib/$APPNAME/backend /usr/local/var/run/$APPNAME.pidfile $dir true diff --git a/test/test_upgrade_quit.sh b/test/test_upgrade_quit.sh index d6a170825..8c9e192e3 100755 --- a/test/test_upgrade_quit.sh +++ b/test/test_upgrade_quit.sh @@ -25,7 +25,7 @@ cat < $cfg interfaces:if-mib $dir /usr/local/var/run/$APPNAME.sock - /usr/local/lib/example/backend + /usr/local/lib/$APPNAME/backend /usr/local/var/run/$APPNAME.pidfile $dir true diff --git a/test/test_upgrade_repair.sh b/test/test_upgrade_repair.sh index 75c118410..106d280c4 100755 --- a/test/test_upgrade_repair.sh +++ b/test/test_upgrade_repair.sh @@ -62,7 +62,7 @@ cat < $cfg $dir $dir /usr/local/var/run/$APPNAME.sock - /usr/local/lib/example/backend + /usr/local/lib/$APPNAME/backend /usr/local/var/run/$APPNAME.pidfile $dir true