From: Masatake YAMATO <yamato@redhat.com>
Date: Mon, 10 Mar 2025 16:21:16 +0000 (+0900)
Subject: tests: (lsfd::mkfds-unix-dgram, refactor) split the test into subtests
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ae0cf4f3ea5f81166cb5c7a0fc112003a6c1607;p=thirdparty%2Futil-linux.git

tests: (lsfd::mkfds-unix-dgram, refactor) split the test into subtests

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
---

diff --git a/tests/expected/lsfd/mkfds-unix-dgram b/tests/expected/lsfd/mkfds-unix-dgram
index dfd91e672..e69de29bb 100644
--- a/tests/expected/lsfd/mkfds-unix-dgram
+++ b/tests/expected/lsfd/mkfds-unix-dgram
@@ -1,6 +0,0 @@
-3 SOCK state=connected\x20path=test_mkfds-unix-dgram\x20type=dgram connected dgram 0 test_mkfds-unix-dgram
-4 SOCK state=connected\x20type=dgram connected dgram 0 
-ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0
-3 SOCK state=connected\x20path=@test_mkfds-unix-dgram\x20type=dgram connected dgram 0 @test_mkfds-unix-dgram
-4 SOCK state=connected\x20type=dgram connected dgram 0 
-ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0
diff --git a/tests/expected/lsfd/mkfds-unix-dgram-abstract b/tests/expected/lsfd/mkfds-unix-dgram-abstract
new file mode 100644
index 000000000..cc5aa8454
--- /dev/null
+++ b/tests/expected/lsfd/mkfds-unix-dgram-abstract
@@ -0,0 +1,3 @@
+3 SOCK state=connected\x20path=@test_mkfds-unix-dgram\x20type=dgram connected dgram 0 @test_mkfds-unix-dgram
+4 SOCK state=connected\x20type=dgram connected dgram 0 
+ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0
diff --git a/tests/expected/lsfd/mkfds-unix-dgram-non-abstract b/tests/expected/lsfd/mkfds-unix-dgram-non-abstract
new file mode 100644
index 000000000..2a9f0947f
--- /dev/null
+++ b/tests/expected/lsfd/mkfds-unix-dgram-non-abstract
@@ -0,0 +1,3 @@
+3 SOCK state=connected\x20path=test_mkfds-unix-dgram\x20type=dgram connected dgram 0 test_mkfds-unix-dgram
+4 SOCK state=connected\x20type=dgram connected dgram 0 
+ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0
diff --git a/tests/ts/lsfd/mkfds-unix-dgram b/tests/ts/lsfd/mkfds-unix-dgram
index 45a0b2da0..c3b0711e4 100755
--- a/tests/ts/lsfd/mkfds-unix-dgram
+++ b/tests/ts/lsfd/mkfds-unix-dgram
@@ -38,6 +38,7 @@ make_state_connected()
     lsfd_make_state_connected | sed -e 's/unconnected/connected/'
 }
 
+ts_init_subtest "non-abstract"
 {
     coproc MKFDS { "$TS_HELPER_MKFDS" unix-dgram $FDS $FDC \
 				      path=test_mkfds-unix-dgram ; }
@@ -51,7 +52,11 @@ make_state_connected()
 	echo DONE >&"${MKFDS[1]}"
     fi
     wait "${MKFDS_PID}"
+} > "$TS_OUTPUT" 2>&1
+ts_finalize_subtest
 
+ts_init_subtest "abstract"
+{
     coproc MKFDS { "$TS_HELPER_MKFDS" unix-dgram $FDS $FDC \
 				      path=test_mkfds-unix-dgram \
 				      abstract=true ; }
@@ -66,5 +71,6 @@ make_state_connected()
     fi
     wait "${MKFDS_PID}"
 } > "$TS_OUTPUT" 2>&1
+ts_finalize_subtest
 
 ts_finalize