From 5e9e23785c347a4b665814ff6b404ecefac370af Mon Sep 17 00:00:00 2001 From: Reiner Herrmann Date: Fri, 6 Aug 2021 12:26:44 +0200 Subject: Use curl in testsuite for up/downloads --- test.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/test.sh b/test.sh index 7ee1800..bf63eb2 100755 --- a/test.sh +++ b/test.sh @@ -18,6 +18,8 @@ TFTPC=/usr/bin/tftp BUSYBOX=/bin/busybox +CURL=/usr/bin/curl + CLIENTDIR=$(mktemp -d) SERVERDIR=$(mktemp -d) @@ -62,6 +64,12 @@ rtftpc() { $RTFTPC $op testfile $opts 127.0.0.1:$PORT 1>/dev/null } +curl() { + [ $TX -eq 1 ] && op="-T" || op="-o" + [ -n "$BLKSIZE" ] && opts="--tftp-blksize $BLKSIZE" + $CURL --silent $op testfile $opts tftp://127.0.0.1:$PORT/testfile +} + busybox_tftpc() { [ $TX -eq 1 ] && op="-p" || op="-g" [ -n "$BLKSIZE" ] && opts="-b $BLKSIZE" @@ -121,6 +129,7 @@ test_transfer rtftpc rtftpd [ -x $ATFTPC ] && test_transfer atftpc rtftpd [ -x $TFTPC ] && test_transfer tftpc rtftpd [ -x $BUSYBOX ] && test_transfer busybox_tftpc rtftpd +[ -x $CURL ] && test_transfer curl rtftpd # with netascii mode printf "\\n\\nTesting netascii transfers\\n" @@ -137,6 +146,7 @@ test_transfer rtftpc rtftpd [ -x $ATFTPD ] && test_transfer rtftpc atftpd [ -x $ATFTPC ] && test_transfer atftpc rtftpd [ -x $BUSYBOX ] && test_transfer busybox_tftpc rtftpd +[ -x $CURL ] && test_transfer curl rtftpd unset BLKSIZE # blocksize and netascii -- cgit v1.2.3