|
 |
e0018b |
From a61377ecf015929de27a665d0b5c937315f9e4aa Mon Sep 17 00:00:00 2001
|
|
|
e0018b |
From: Dan Williams <dan.j.williams@intel.com>
|
|
|
e0018b |
Date: Sun, 23 Jan 2022 16:51:54 -0800
|
|
|
e0018b |
Subject: [PATCH 087/217] test: Add 'suite' identifiers to tests
|
|
|
e0018b |
|
|
|
e0018b |
In preparation for adding CXL tests, and in anticipation of wanting to only
|
|
|
e0018b |
run the CXL tests, label each test with a suite id.
|
|
|
e0018b |
|
|
|
e0018b |
Link: https://lore.kernel.org/r/164298551461.3021641.4591877842309963514.stgit@dwillia2-desk3.amr.corp.intel.com
|
|
|
e0018b |
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
|
|
|
e0018b |
Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
|
|
|
e0018b |
---
|
|
|
e0018b |
test/meson.build | 73 ++++++++++++++++++++++++------------------------
|
|
|
e0018b |
1 file changed, 37 insertions(+), 36 deletions(-)
|
|
|
e0018b |
|
|
|
e0018b |
diff --git a/test/meson.build b/test/meson.build
|
|
|
e0018b |
index 94287aa..07a5bb6 100644
|
|
|
e0018b |
--- a/test/meson.build
|
|
|
e0018b |
+++ b/test/meson.build
|
|
|
e0018b |
@@ -152,28 +152,28 @@ pfn_meta_errors = find_program('pfn-meta-errors.sh')
|
|
|
e0018b |
track_uuid = find_program('track-uuid.sh')
|
|
|
e0018b |
|
|
|
e0018b |
tests = [
|
|
|
e0018b |
- [ 'libndctl', libndctl ],
|
|
|
e0018b |
- [ 'dsm-fail', dsm_fail ],
|
|
|
e0018b |
- [ 'create.sh', create ],
|
|
|
e0018b |
- [ 'clear.sh', clear ],
|
|
|
e0018b |
- [ 'pmem-errors.sh', pmem_errors ],
|
|
|
e0018b |
- [ 'daxdev-errors.sh', daxdev_errors_sh ],
|
|
|
e0018b |
- [ 'multi-dax.sh', multi_dax ],
|
|
|
e0018b |
- [ 'btt-check.sh', btt_check ],
|
|
|
e0018b |
- [ 'label-compat.sh', label_compat ],
|
|
|
e0018b |
- [ 'sector-mode.sh', sector_mode ],
|
|
|
e0018b |
- [ 'inject-error.sh', inject_error ],
|
|
|
e0018b |
- [ 'btt-errors.sh', btt_errors ],
|
|
|
e0018b |
- [ 'hugetlb', hugetlb ],
|
|
|
e0018b |
- [ 'btt-pad-compat.sh', btt_pad_compat ],
|
|
|
e0018b |
- [ 'firmware-update.sh', firmware_update ],
|
|
|
e0018b |
- [ 'ack-shutdown-count-set', ack_shutdown_count ],
|
|
|
e0018b |
- [ 'rescan-partitions.sh', rescan_partitions ],
|
|
|
e0018b |
- [ 'inject-smart.sh', inject_smart ],
|
|
|
e0018b |
- [ 'monitor.sh', monitor ],
|
|
|
e0018b |
- [ 'max_extent_ns', max_extent ],
|
|
|
e0018b |
- [ 'pfn-meta-errors.sh', pfn_meta_errors ],
|
|
|
e0018b |
- [ 'track-uuid.sh', track_uuid ],
|
|
|
e0018b |
+ [ 'libndctl', libndctl, 'ndctl' ],
|
|
|
e0018b |
+ [ 'dsm-fail', dsm_fail, 'ndctl' ],
|
|
|
e0018b |
+ [ 'create.sh', create, 'ndctl' ],
|
|
|
e0018b |
+ [ 'clear.sh', clear, 'ndctl' ],
|
|
|
e0018b |
+ [ 'pmem-errors.sh', pmem_errors, 'ndctl' ],
|
|
|
e0018b |
+ [ 'daxdev-errors.sh', daxdev_errors_sh, 'dax' ],
|
|
|
e0018b |
+ [ 'multi-dax.sh', multi_dax, 'dax' ],
|
|
|
e0018b |
+ [ 'btt-check.sh', btt_check, 'ndctl' ],
|
|
|
e0018b |
+ [ 'label-compat.sh', label_compat, 'ndctl' ],
|
|
|
e0018b |
+ [ 'sector-mode.sh', sector_mode, 'ndctl' ],
|
|
|
e0018b |
+ [ 'inject-error.sh', inject_error, 'ndctl' ],
|
|
|
e0018b |
+ [ 'btt-errors.sh', btt_errors, 'ndctl' ],
|
|
|
e0018b |
+ [ 'hugetlb', hugetlb, 'ndctl' ],
|
|
|
e0018b |
+ [ 'btt-pad-compat.sh', btt_pad_compat, 'ndctl' ],
|
|
|
e0018b |
+ [ 'firmware-update.sh', firmware_update, 'ndctl' ],
|
|
|
e0018b |
+ [ 'ack-shutdown-count-set', ack_shutdown_count, 'ndctl' ],
|
|
|
e0018b |
+ [ 'rescan-partitions.sh', rescan_partitions, 'ndctl' ],
|
|
|
e0018b |
+ [ 'inject-smart.sh', inject_smart, 'ndctl' ],
|
|
|
e0018b |
+ [ 'monitor.sh', monitor, 'ndctl' ],
|
|
|
e0018b |
+ [ 'max_extent_ns', max_extent, 'ndctl' ],
|
|
|
e0018b |
+ [ 'pfn-meta-errors.sh', pfn_meta_errors, 'ndctl' ],
|
|
|
e0018b |
+ [ 'track-uuid.sh', track_uuid, 'ndctl' ],
|
|
|
e0018b |
]
|
|
|
e0018b |
|
|
|
e0018b |
if get_option('destructive').enabled()
|
|
|
e0018b |
@@ -188,26 +188,26 @@ if get_option('destructive').enabled()
|
|
|
e0018b |
mmap_test = find_program('mmap.sh')
|
|
|
e0018b |
|
|
|
e0018b |
tests += [
|
|
|
e0018b |
- [ 'pmem-ns', pmem_ns ],
|
|
|
e0018b |
- [ 'sub-section.sh', sub_section ],
|
|
|
e0018b |
- [ 'dax-dev', dax_dev ],
|
|
|
e0018b |
- [ 'dax-ext4.sh', dax_ext4 ],
|
|
|
e0018b |
- [ 'dax-xfs.sh', dax_xfs ],
|
|
|
e0018b |
- [ 'align.sh', align ],
|
|
|
e0018b |
- [ 'device-dax', device_dax ],
|
|
|
e0018b |
- [ 'revoke-devmem', revoke_devmem ],
|
|
|
e0018b |
- [ 'device-dax-fio.sh', device_dax_fio ],
|
|
|
e0018b |
- [ 'daxctl-devices.sh', daxctl_devices ],
|
|
|
e0018b |
- [ 'daxctl-create.sh', daxctl_create ],
|
|
|
e0018b |
- [ 'dm.sh', dm ],
|
|
|
e0018b |
- [ 'mmap.sh', mmap_test ],
|
|
|
e0018b |
+ [ 'pmem-ns', pmem_ns, 'ndctl' ],
|
|
|
e0018b |
+ [ 'sub-section.sh', sub_section, 'dax' ],
|
|
|
e0018b |
+ [ 'dax-dev', dax_dev, 'dax' ],
|
|
|
e0018b |
+ [ 'dax-ext4.sh', dax_ext4, 'dax' ],
|
|
|
e0018b |
+ [ 'dax-xfs.sh', dax_xfs, 'dax' ],
|
|
|
e0018b |
+ [ 'align.sh', align, 'ndctl' ],
|
|
|
e0018b |
+ [ 'device-dax', device_dax, 'dax' ],
|
|
|
e0018b |
+ [ 'revoke-devmem', revoke_devmem, 'dax' ],
|
|
|
e0018b |
+ [ 'device-dax-fio.sh', device_dax_fio, 'dax' ],
|
|
|
e0018b |
+ [ 'daxctl-devices.sh', daxctl_devices, 'dax' ],
|
|
|
e0018b |
+ [ 'daxctl-create.sh', daxctl_create, 'dax' ],
|
|
|
e0018b |
+ [ 'dm.sh', dm, 'dax' ],
|
|
|
e0018b |
+ [ 'mmap.sh', mmap_test, 'dax' ],
|
|
|
e0018b |
]
|
|
|
e0018b |
endif
|
|
|
e0018b |
|
|
|
e0018b |
if get_option('keyutils').enabled()
|
|
|
e0018b |
security = find_program('security.sh')
|
|
|
e0018b |
tests += [
|
|
|
e0018b |
- [ 'security.sh', security ]
|
|
|
e0018b |
+ [ 'security.sh', security, 'ndctl' ]
|
|
|
e0018b |
]
|
|
|
e0018b |
endif
|
|
|
e0018b |
|
|
|
e0018b |
@@ -226,6 +226,7 @@ foreach t : tests
|
|
|
e0018b |
dax_dev,
|
|
|
e0018b |
mmap,
|
|
|
e0018b |
],
|
|
|
e0018b |
+ suite: t[2],
|
|
|
e0018b |
timeout : 0,
|
|
|
e0018b |
env : [
|
|
|
e0018b |
'NDCTL=@0@'.format(ndctl_tool.full_path()),
|
|
|
e0018b |
--
|
|
|
e0018b |
2.27.0
|
|
|
e0018b |
|