]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
Merge branch 'blockdev_tests' of https://github.com/cgoesche/util-linux-fork
authorKarel Zak <kzak@redhat.com>
Thu, 28 May 2026 10:38:01 +0000 (12:38 +0200)
committerKarel Zak <kzak@redhat.com>
Thu, 28 May 2026 10:38:01 +0000 (12:38 +0200)
* 'blockdev_tests' of https://github.com/cgoesche/util-linux-fork:
  tests: (blockdev) add missing tests

# Conflicts:
# tests/commands.sh

1  2 
tests/commands.sh

index 2df6af7c215b05b9829de335832f919d32efc9da,a79116fd0301d20bef3bd9f24cf71ed4e3df3572..f339819ac6fd719bf9ebff437c9c7842fcd38f34
@@@ -76,11 -76,10 +76,12 @@@ TS_HELPER_PARSEPID="${ts_helpersdir}tes
  TS_CMD_ADDPART=${TS_CMD_ADDPART:-"${ts_commandsdir}addpart"}
  TS_CMD_DELPART=${TS_CMD_DELPART:-"${ts_commandsdir}delpart"}
  TS_CMD_BITS=${TS_CMD_BITS-"${ts_commandsdir}bits"}
 -TS_CMD_BLKDISCARD=${TS_CMD_BLKID-"${ts_commandsdir}blkdiscard"}
 +TS_CMD_BLKDISCARD=${TS_CMD_BLKDISCARD-"${ts_commandsdir}blkdiscard"}
  TS_CMD_BLKID=${TS_CMD_BLKID-"${ts_commandsdir}blkid"}
+ TS_CMD_BLOCKDEV=${TS_CMD_BLOCKDEV-"${ts_commandsdir}blockdev"}
 +TS_CMD_BLKZONE=${TS_CMD_BLKZONE-"${ts_commandsdir}blkzone"}
  TS_CMD_CAL=${TS_CMD_CAL-"${ts_commandsdir}cal"}
 +TS_CMD_CHMEM=${TS_CMD_CHMEM:-"${ts_commandsdir}chmem"}
  TS_CMD_CHOOM=${TS_CMD_CHOOM:-"${ts_commandsdir}choom"}
  TS_CMD_CHSH=${TS_CMD_CHSH:-"${ts_commandsdir}chsh"}
  TS_CMD_COLCRT=${TS_CMD_COLCRT:-"${ts_commandsdir}colcrt"}