netbird/plugins
0
0
Fork 0
mirror of https://github.com/netbirdio/plugins.git synced 2026-05-22 18:44:07 -07:00
Code Issues Packages Projects Releases Wiki Activity

debug/devel: fix scapy prefix and pivot to atf port

Browse Source
This commit is contained in:
Franco Fichtner
2024-11-13 08:46:29 +01:00
parent ecced78fab
commit 955306a03f
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
devel/debug/Makefile
+2 -1
View File
@@ -5,7 +5,8 @@ PLUGIN_DEPENDS= php${PLUGIN_PHP}-pear-PHP_CodeSniffer \
php${PLUGIN_PHP}-pecl-xdebug \
phpunit9-php${PLUGIN_PHP} \
py${PLUGIN_PYTHON}-pycodestyle \
p5-File-Slurp git jq scapy
py${PLUGIN_PYTHON}-scapy \
p5-File-Slurp atf git jq
PLUGIN_MAINTAINER= franco@opnsense.org
PLUGIN_TIER= 2
devel/debug/src/sbin/opnsense-atf
+5 -4
View File
@@ -23,6 +23,7 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
ATFCMD=/usr/local/bin/atf-sh
PATTERNS="-e ^passed -e ^skipped -e ^failed"
TESTDIR=/usr/src/tests/sys/netpfil/pf
__RUNNING_INSIDE_ATF_RUN=internal-yes-value
@@ -94,9 +95,9 @@ run()
if [ -n "${TESTCASE}" -a "${TESTCASE}" != "${CASE}" ]; then
continue
fi
RESULT=$( (/usr/libexec/atf-sh ${TEST} ${CASE} 2>&1) | grep ${PATTERNS})
RESULT=$( (${ATFCMD} ${TEST} ${CASE} 2>&1) | grep ${PATTERNS})
if [ -n "${CLEANUP}" ]; then
/usr/libexec/atf-sh ${TEST} ${CASE}:cleanup > /dev/null 2>&1
${ATFCMD} ${TEST} ${CASE}:cleanup > /dev/null 2>&1
fi
if [ -z "${DO_DEBUG}" ]; then
echo ">>> $(basename ${TESTDIR})(${TESTFILE}:${CASE}): ${RESULT}"
@@ -117,8 +118,8 @@ if [ -n "${DO_ALL}" ]; then
fi
# We could consider copying the whole test setup
# somewhere else # but the whole thing needs to
# be redesigned anyway. Fudge this locally.
# somewhere else but the whole thing needs to be
# redesigned anyway. Fudge this locally.
chmod 555 ${TESTDIR}/../common/*.sh ${TESTDIR}/../common/*.py ${TESTDIR}/*.py
for TEST in ${TESTS}; do