From 635fd4af54690b988111e46a01587f56841773d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojt=C4=9Bch=20Eichler?= Date: Mon, 13 Sep 2021 10:59:59 +0200 Subject: [PATCH] tests: use subtests --- tests/expected/ipcs/headers | 64 ------------------------ tests/expected/ipcs/headers-all-headers | 35 +++++++++++++ tests/expected/ipcs/headers-mesg-headers | 8 +++ tests/expected/ipcs/headers-sem-headers | 6 +++ tests/expected/ipcs/headers-shm-headers | 8 +++ tests/ts/ipcs/headers | 58 ++++++++++----------- 6 files changed, 86 insertions(+), 93 deletions(-) create mode 100644 tests/expected/ipcs/headers-all-headers create mode 100644 tests/expected/ipcs/headers-mesg-headers create mode 100644 tests/expected/ipcs/headers-sem-headers create mode 100644 tests/expected/ipcs/headers-shm-headers diff --git a/tests/expected/ipcs/headers b/tests/expected/ipcs/headers index fab8fef37..e69de29bb 100644 --- a/tests/expected/ipcs/headers +++ b/tests/expected/ipcs/headers @@ -1,64 +0,0 @@ -test: shm headers ------- Shared Memory Attach/Detach/Change Times -------- -shmid owner attached detached changed ------- Shared Memory Creator/Last-op PIDs -------- -shmid owner cpid lpid ------- Shared Memory Segment Creators/Owners -------- -shmid perms cuid cgid uid gid ------- Shared Memory Limits -------- ------- Shared Memory Status -------- - -test: mesg headers ------- Message Queues Send/Recv/Change Times -------- -msqid owner send recv change ------- Message Queues PIDs -------- -msqid owner lspid lrpid ------- Message Queues Creators/Owners -------- -msqid perms cuid cgid uid gid ------- Messages Limits -------- ------- Messages Status -------- - -test: sem headers ------- Semaphore Operation/Change Times -------- -semid owner last-op last-changed ------- Semaphore Arrays Creators/Owners -------- -semid perms cuid cgid uid gid ------- Semaphore Limits -------- ------- Semaphore Status -------- - -test: all headers ------- Message Queues -------- -key msqid owner perms used-bytes messages --- ------- Shared Memory Segments -------- -key shmid owner perms bytes nattch status --- ------- Semaphore Arrays -------- -key semid owner perms nsems ------- Message Queues Send/Recv/Change Times -------- -msqid owner send recv change --- ------- Shared Memory Attach/Detach/Change Times -------- -shmid owner attached detached changed --- ------- Semaphore Operation/Change Times -------- -semid owner last-op last-changed ------- Message Queues PIDs -------- -msqid owner lspid lrpid --- ------- Shared Memory Creator/Last-op PIDs -------- -shmid owner cpid lpid ------- Message Queues Creators/Owners -------- -msqid perms cuid cgid uid gid --- ------- Shared Memory Segment Creators/Owners -------- -shmid perms cuid cgid uid gid --- ------- Semaphore Arrays Creators/Owners -------- -semid perms cuid cgid uid gid ------- Messages Limits -------- ------- Shared Memory Limits -------- ------- Semaphore Limits -------- ------- Messages Status -------- ------- Shared Memory Status -------- ------- Semaphore Status -------- diff --git a/tests/expected/ipcs/headers-all-headers b/tests/expected/ipcs/headers-all-headers new file mode 100644 index 000000000..328a5e786 --- /dev/null +++ b/tests/expected/ipcs/headers-all-headers @@ -0,0 +1,35 @@ +------ Message Queues -------- +key msqid owner perms used-bytes messages +-- +------ Shared Memory Segments -------- +key shmid owner perms bytes nattch status +-- +------ Semaphore Arrays -------- +key semid owner perms nsems +------ Message Queues Send/Recv/Change Times -------- +msqid owner send recv change +-- +------ Shared Memory Attach/Detach/Change Times -------- +shmid owner attached detached changed +-- +------ Semaphore Operation/Change Times -------- +semid owner last-op last-changed +------ Message Queues PIDs -------- +msqid owner lspid lrpid +-- +------ Shared Memory Creator/Last-op PIDs -------- +shmid owner cpid lpid +------ Message Queues Creators/Owners -------- +msqid perms cuid cgid uid gid +-- +------ Shared Memory Segment Creators/Owners -------- +shmid perms cuid cgid uid gid +-- +------ Semaphore Arrays Creators/Owners -------- +semid perms cuid cgid uid gid +------ Messages Limits -------- +------ Shared Memory Limits -------- +------ Semaphore Limits -------- +------ Messages Status -------- +------ Shared Memory Status -------- +------ Semaphore Status -------- diff --git a/tests/expected/ipcs/headers-mesg-headers b/tests/expected/ipcs/headers-mesg-headers new file mode 100644 index 000000000..613c40aa1 --- /dev/null +++ b/tests/expected/ipcs/headers-mesg-headers @@ -0,0 +1,8 @@ +------ Message Queues Send/Recv/Change Times -------- +msqid owner send recv change +------ Message Queues PIDs -------- +msqid owner lspid lrpid +------ Message Queues Creators/Owners -------- +msqid perms cuid cgid uid gid +------ Messages Limits -------- +------ Messages Status -------- diff --git a/tests/expected/ipcs/headers-sem-headers b/tests/expected/ipcs/headers-sem-headers new file mode 100644 index 000000000..460586be4 --- /dev/null +++ b/tests/expected/ipcs/headers-sem-headers @@ -0,0 +1,6 @@ +------ Semaphore Operation/Change Times -------- +semid owner last-op last-changed +------ Semaphore Arrays Creators/Owners -------- +semid perms cuid cgid uid gid +------ Semaphore Limits -------- +------ Semaphore Status -------- diff --git a/tests/expected/ipcs/headers-shm-headers b/tests/expected/ipcs/headers-shm-headers new file mode 100644 index 000000000..84aeff6d7 --- /dev/null +++ b/tests/expected/ipcs/headers-shm-headers @@ -0,0 +1,8 @@ +------ Shared Memory Attach/Detach/Change Times -------- +shmid owner attached detached changed +------ Shared Memory Creator/Last-op PIDs -------- +shmid owner cpid lpid +------ Shared Memory Segment Creators/Owners -------- +shmid perms cuid cgid uid gid +------ Shared Memory Limits -------- +------ Shared Memory Status -------- diff --git a/tests/ts/ipcs/headers b/tests/ts/ipcs/headers index 475ed56b3..1ee13a9aa 100755 --- a/tests/ts/ipcs/headers +++ b/tests/ts/ipcs/headers @@ -23,38 +23,38 @@ ts_init "$*" ts_check_test_command "$TS_CMD_IPCS" -ts_log "test: shm headers" -$TS_CMD_IPCS -m -t | grep -A1 "^---" >> $TS_OUTPUT -$TS_CMD_IPCS -m -p | grep -A1 "^---" >> $TS_OUTPUT -$TS_CMD_IPCS -m -c | grep -A1 "^---" >> $TS_OUTPUT -$TS_CMD_IPCS -m -l | grep "^---" >> $TS_OUTPUT -$TS_CMD_IPCS -m -u | grep "^---" >> $TS_OUTPUT -echo >> $TS_OUTPUT +ts_init_subtest "shm-headers" +$TS_CMD_IPCS -m -t | grep -A1 "^---" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_IPCS -m -p | grep -A1 "^---" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_IPCS -m -c | grep -A1 "^---" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_IPCS -m -l | grep "^---" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_IPCS -m -u | grep "^---" >> $TS_OUTPUT 2>> $TS_ERRLOG +ts_finalize_subtest -ts_log "test: mesg headers" -$TS_CMD_IPCS -q -t | grep -A1 "^---" >> $TS_OUTPUT -$TS_CMD_IPCS -q -p | grep -A1 "^---" >> $TS_OUTPUT -$TS_CMD_IPCS -q -c | grep -A1 "^---" >> $TS_OUTPUT -$TS_CMD_IPCS -q -l | grep "^---" >> $TS_OUTPUT -$TS_CMD_IPCS -q -u | grep "^---" >> $TS_OUTPUT -echo >> $TS_OUTPUT +ts_init_subtest "mesg-headers" +$TS_CMD_IPCS -q -t | grep -A1 "^---" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_IPCS -q -p | grep -A1 "^---" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_IPCS -q -c | grep -A1 "^---" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_IPCS -q -l | grep "^---" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_IPCS -q -u | grep "^---" >> $TS_OUTPUT 2>> $TS_ERRLOG +ts_finalize_subtest -ts_log "test: sem headers" -$TS_CMD_IPCS -s -t | grep -A1 "^---" >> $TS_OUTPUT -$TS_CMD_IPCS -s -p | grep -A1 "^---" >> $TS_OUTPUT -$TS_CMD_IPCS -s -c | grep -A1 "^---" >> $TS_OUTPUT -$TS_CMD_IPCS -s -l | grep "^---" >> $TS_OUTPUT -$TS_CMD_IPCS -s -u | grep "^---" >> $TS_OUTPUT -echo >> $TS_OUTPUT +ts_init_subtest "sem-headers" +$TS_CMD_IPCS -s -t | grep -A1 "^---" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_IPCS -s -p | grep -A1 "^---" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_IPCS -s -c | grep -A1 "^---" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_IPCS -s -l | grep "^---" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_IPCS -s -u | grep "^---" >> $TS_OUTPUT 2>> $TS_ERRLOG +ts_finalize_subtest -ts_log "test: all headers" -$TS_CMD_IPCS -a | grep -A1 "^---" >> $TS_OUTPUT +ts_init_subtest "all-headers" +$TS_CMD_IPCS -a | grep -A1 "^---" >> $TS_OUTPUT 2>> $TS_ERRLOG -$TS_CMD_IPCS -a -t | grep -A1 "^---" >> $TS_OUTPUT -$TS_CMD_IPCS -a -p | grep -A1 "^---" >> $TS_OUTPUT -$TS_CMD_IPCS -a -c | grep -A1 "^---" >> $TS_OUTPUT -$TS_CMD_IPCS -a -l | grep "^---" >> $TS_OUTPUT -$TS_CMD_IPCS -a -u | grep "^---" >> $TS_OUTPUT +$TS_CMD_IPCS -a -t | grep -A1 "^---" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_IPCS -a -p | grep -A1 "^---" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_IPCS -a -c | grep -A1 "^---" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_IPCS -a -l | grep "^---" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_IPCS -a -u | grep "^---" >> $TS_OUTPUT 2>> $TS_ERRLOG +ts_finalize_subtest ts_finalize -