blob: 9524adf7b824023553d75cda55dc9f7069f045c8 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
|
From 9f844484cedb39e301b016e9da7852c1a0fb6eea Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Wed, 11 Dec 2019 16:27:48 +0100
Subject: [PATCH] tests: use skip_ rather than skip_test_ (which is undefined)
Upstream-Status: Pending
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
tests/t6001-psep.sh | 2 +-
tests/t6004-dm-many-partitions.sh | 2 +-
tests/t6005-dm-uuid.sh | 2 +-
tests/t6006-dm-512b-sectors.sh | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/t6001-psep.sh b/tests/t6001-psep.sh
index e350bd2..67014a0 100644
--- a/tests/t6001-psep.sh
+++ b/tests/t6001-psep.sh
@@ -21,7 +21,7 @@
require_root_
require_udevadm_settle_
-(dmsetup --help) > /dev/null 2>&1 || skip_test_ "No dmsetup installed"
+(dmsetup --help) > /dev/null 2>&1 || skip_ "No dmsetup installed"
# Device maps names - should be random to not conflict with existing ones on
# the system
diff --git a/tests/t6004-dm-many-partitions.sh b/tests/t6004-dm-many-partitions.sh
index b4be975..7214f60 100755
--- a/tests/t6004-dm-many-partitions.sh
+++ b/tests/t6004-dm-many-partitions.sh
@@ -21,7 +21,7 @@
require_root_
require_udevadm_settle_
-(dmsetup --help) > /dev/null 2>&1 || skip_test_ "No dmsetup installed"
+(dmsetup --help) > /dev/null 2>&1 || skip_ "No dmsetup installed"
ss=$sector_size_
ns=300
diff --git a/tests/t6005-dm-uuid.sh b/tests/t6005-dm-uuid.sh
index 4266747..4790a8b 100755
--- a/tests/t6005-dm-uuid.sh
+++ b/tests/t6005-dm-uuid.sh
@@ -21,7 +21,7 @@
require_root_
require_udevadm_settle_
-(dmsetup --help) > /dev/null 2>&1 || skip_test_ "No dmsetup installed"
+(dmsetup --help) > /dev/null 2>&1 || skip_ "No dmsetup installed"
ss=$sector_size_
ns=300
diff --git a/tests/t6006-dm-512b-sectors.sh b/tests/t6006-dm-512b-sectors.sh
index bf32135..b679adb 100644
--- a/tests/t6006-dm-512b-sectors.sh
+++ b/tests/t6006-dm-512b-sectors.sh
@@ -25,7 +25,7 @@ require_scsi_debug_module_
grep '^#define USE_BLKID 1' "$CONFIG_HEADER" > /dev/null ||
skip_ 'this system lacks a new-enough libblkid'
-(dmsetup --help) > /dev/null 2>&1 || skip_test_ "No dmsetup installed"
+(dmsetup --help) > /dev/null 2>&1 || skip_ "No dmsetup installed"
# Device maps names - should be random to not conflict with existing ones on
# the system
|
