tcp_cmds: Remove ftp01.sh test, binary data files

FTP login tests were removed in 6282e55, as out of scope of of kernel testing. ftp01.sh is FTP server unit test, which is also not relevant for kernel testing, thus removing. Remove also binary data files bin.sm, bin.med, bin.lg, bin.jmb which are not needed any more. Link: https://lore.kernel.org/ltp/[email protected]/ Reviewed-by: Wei Gao <[email protected]> Reviewed-by: Cyril Hrubis <[email protected]> Signed-off-by: Petr Vorel <[email protected]>
linux-test-project · Nov 4, 2024 · b8531de · b8531de
1 parent 2345298
commit b8531de
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 140 deletions.
diff --git a/runtest/net.tcp_cmds b/runtest/net.tcp_cmds
@@ -5,7 +5,6 @@
 ipneigh01_arp ipneigh01.sh -c arp
 ipneigh01_ip ipneigh01.sh -c ip
 arping01 arping01.sh
-ftp ftp01.sh
 netstat netstat01.sh
 ping01 ping01.sh
 ping02 ping02.sh

diff --git a/testcases/network/Makefile b/testcases/network/Makefile
@@ -14,7 +14,6 @@ CLEAN_TARGETS		+= $(DIR)
 INSTALL_DIR		:= testcases/bin
 
 INSTALL_TARGETS		:= $(addprefix $(DIR)/ascii.,sm med lg jmb)
-INSTALL_TARGETS		+= $(addprefix $(DIR)/bin.,sm med lg jmb)
 
 RM			+= -r
 

diff --git a/testcases/network/generate.sh b/testcases/network/generate.sh
@@ -51,29 +51,3 @@ fi
 "$make_file" "$medium_file" $medium_size
 "$make_file" "$large_file" $large_size
 "$make_file" "$jumbo_file" $jumbo_size
-
-if [ ! -e "bin.sm" ] ; then
-	cnt=0
-	while [ $cnt -lt 5 ] ; do
-		gzip -1 -c -n ascii.sm >> "bin.sm"
-		cnt=$(($cnt + 1))
-	done
-fi
-
-genfile() {
-	local input="$1" output="$2"
-	local cnt=19
-
-	[ -e "$output" ] && return $?
-
-	while [ $cnt -ge 0 ] ; do
-		cat "$input" >> "$output"
-		cnt=$(($cnt-1))
-	done
-}
-
-genfile bin.sm bin.med
-genfile bin.med bin.lg
-genfile bin.lg bin.jmb
-
-chmod 666 bin.*
diff --git a/testcases/network/tcp_cmds/Makefile b/testcases/network/tcp_cmds/Makefile
@@ -7,13 +7,9 @@ top_srcdir		?= ../../..
 
 include $(top_srcdir)/include/mk/env_pre.mk
 
-ifneq ($(WITH_EXPECT),yes)
-FILTER_OUT_SUBDIRS	:= ftp
-endif
+INSTALL_DEPS		:= ../datafiles/ascii.sm
 
-INSTALL_DEPS		:= ../datafiles/bin.sm
-
-../datafiles/bin.sm:
+../datafiles/ascii.sm:
 	$(MAKE) -C .. -f "$(abs_srcdir)/../Makefile" generate
 
 include $(top_srcdir)/include/mk/generic_trunk_target.mk
diff --git a/testcases/network/tcp_cmds/Makefile.inc b/testcases/network/tcp_cmds/Makefile.inc
@@ -22,7 +22,7 @@
 
 GENERATE_FILE_DIR	:= ../..
 
-MAKE_DEPS		:= $(GENERATE_FILE_DIR)/datafiles/bin.sm
+MAKE_DEPS		:= $(GENERATE_FILE_DIR)/datafiles/ascii.sm
 
 $(MAKE_DEPS):
 	$(MAKE) -C $(GENERATE_FILE_DIR) \

diff --git a/testcases/network/tcp_cmds/ftp/Makefile b/testcases/network/tcp_cmds/ftp/Makefile
diff --git a/testcases/network/tcp_cmds/ftp/ftp01.sh b/testcases/network/tcp_cmds/ftp/ftp01.sh