Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

tests/cp_files: ignore if SEEK_DATA is not defined 

Not all C libraries support SEEK_DATA (e.g., uClibc). Skip the test case
cp_files if SEEK_DATA is not defined.

Signed-off-by: José Luis Salvador Rufo <salvador.joseluis@gmail.com>
This commit is contained in:
José Luis Salvador Rufo 2024-05-11 22:40:12 +02:00
parent c98295eed2
commit cfa28bf9a9
No known key found for this signature in database
GPG Key ID: 9F16C69F2B9DD678
7 changed files with 43 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
config/user-unistd.m4 Normal file
View File

@ -0,0 +1,24 @@
dnl #
dnl # Check for SEEK_DATA - only used for cp_files/seekflood test case.
dnl #
AC_DEFUN([ZFS_AC_CONFIG_USER_UNISTD_SEEK_DATA], [
AC_MSG_CHECKING(whether host toolchain supports SEEK_DATA)
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif
#include <unistd.h>
#if defined(SEEK_DATA)
int ok;
#else
error fail
#endif
]])], [
user_unistd_seek_data=yes
AC_MSG_RESULT([yes])
], [
user_unistd_seek_data=no
AC_MSG_RESULT([no])
])
])

1
config/user.m4
View File

@ -23,6 +23,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER], [
ZFS_AC_CONFIG_USER_LIBAIO ZFS_AC_CONFIG_USER_LIBAIO
ZFS_AC_CONFIG_USER_LIBATOMIC ZFS_AC_CONFIG_USER_LIBATOMIC
ZFS_AC_CONFIG_USER_LIBFETCH ZFS_AC_CONFIG_USER_LIBFETCH
ZFS_AC_CONFIG_USER_UNISTD_SEEK_DATA
ZFS_AC_CONFIG_USER_AIO_H ZFS_AC_CONFIG_USER_AIO_H
ZFS_AC_CONFIG_USER_CLOCK_GETTIME ZFS_AC_CONFIG_USER_CLOCK_GETTIME
ZFS_AC_CONFIG_USER_PAM ZFS_AC_CONFIG_USER_PAM

1
config/zfs-build.m4
View File

@ -294,6 +294,7 @@ AC_DEFUN([ZFS_AC_CONFIG], [
[test "x$qatsrc" != x ]) [test "x$qatsrc" != x ])
AM_CONDITIONAL([WANT_DEVNAME2DEVID], [test "x$user_libudev" = xyes ]) AM_CONDITIONAL([WANT_DEVNAME2DEVID], [test "x$user_libudev" = xyes ])
AM_CONDITIONAL([WANT_MMAP_LIBAIO], [test "x$user_libaio" = xyes ]) AM_CONDITIONAL([WANT_MMAP_LIBAIO], [test "x$user_libaio" = xyes ])
AM_CONDITIONAL([WANT_UNISTD_SEEK_DATA], [test "x$user_unistd_seek_data" = xyes ])
AM_CONDITIONAL([PAM_ZFS_ENABLED], [test "x$enable_pam" = xyes]) AM_CONDITIONAL([PAM_ZFS_ENABLED], [test "x$enable_pam" = xyes])
]) ])

1
tests/test-runner/bin/zts-report.py.in
View File

@ -162,6 +162,7 @@ known = {
['FAIL', rewind_reason], ['FAIL', rewind_reason],
'cli_user/misc/zfs_share_001_neg': ['SKIP', na_reason], 'cli_user/misc/zfs_share_001_neg': ['SKIP', na_reason],
'cli_user/misc/zfs_unshare_001_neg': ['SKIP', na_reason], 'cli_user/misc/zfs_unshare_001_neg': ['SKIP', na_reason],
'cp_files/cp_stress': ['SKIP', 16169],
'pool_checkpoint/checkpoint_discard_busy': ['SKIP', 12053], 'pool_checkpoint/checkpoint_discard_busy': ['SKIP', 12053],
'privilege/setup': ['SKIP', na_reason], 'privilege/setup': ['SKIP', na_reason],
'refreserv/refreserv_004_pos': ['FAIL', known_reason], 'refreserv/refreserv_004_pos': ['FAIL', known_reason],

2
tests/zfs-tests/Makefile.am
View File

@ -16,8 +16,10 @@ scripts_zfs_tests_functional_hkdf_PROGRAMS = %D%/tests/functional/hkdf/hkdf_test
scripts_zfs_tests_functional_vdev_diskdir = $(datadir)/$(PACKAGE)/zfs-tests/tests/functional/vdev_disk scripts_zfs_tests_functional_vdev_diskdir = $(datadir)/$(PACKAGE)/zfs-tests/tests/functional/vdev_disk
scripts_zfs_tests_functional_vdev_disk_PROGRAMS = %D%/tests/functional/vdev_disk/page_alignment scripts_zfs_tests_functional_vdev_disk_PROGRAMS = %D%/tests/functional/vdev_disk/page_alignment
if WANT_UNISTD_SEEK_DATA
scripts_zfs_tests_functional_cp_filesdir = $(datadir)/$(PACKAGE)/zfs-tests/tests/functional/cp_files scripts_zfs_tests_functional_cp_filesdir = $(datadir)/$(PACKAGE)/zfs-tests/tests/functional/cp_files
scripts_zfs_tests_functional_cp_files_PROGRAMS = %D%/tests/functional/cp_files/seekflood scripts_zfs_tests_functional_cp_files_PROGRAMS = %D%/tests/functional/cp_files/seekflood
endif
if BUILD_LINUX if BUILD_LINUX
scripts_zfs_tests_functional_tmpfiledir = $(datadir)/$(PACKAGE)/zfs-tests/tests/functional/tmpfile scripts_zfs_tests_functional_tmpfiledir = $(datadir)/$(PACKAGE)/zfs-tests/tests/functional/tmpfile

6
tests/zfs-tests/cmd/Makefile.am
View File

@ -5,7 +5,6 @@ scripts_zfs_tests_bin_PROGRAMS = %D%/chg_usr_exec
scripts_zfs_tests_bin_PROGRAMS += %D%/clonefile scripts_zfs_tests_bin_PROGRAMS += %D%/clonefile
scripts_zfs_tests_bin_PROGRAMS += %D%/clone_mmap_cached scripts_zfs_tests_bin_PROGRAMS += %D%/clone_mmap_cached
scripts_zfs_tests_bin_PROGRAMS += %D%/clone_mmap_write scripts_zfs_tests_bin_PROGRAMS += %D%/clone_mmap_write
scripts_zfs_tests_bin_PROGRAMS += %D%/cp_files
scripts_zfs_tests_bin_PROGRAMS += %D%/ctime scripts_zfs_tests_bin_PROGRAMS += %D%/ctime
scripts_zfs_tests_bin_PROGRAMS += %D%/dir_rd_update scripts_zfs_tests_bin_PROGRAMS += %D%/dir_rd_update
scripts_zfs_tests_bin_PROGRAMS += %D%/dosmode_readonly_write scripts_zfs_tests_bin_PROGRAMS += %D%/dosmode_readonly_write
@ -16,6 +15,11 @@ scripts_zfs_tests_bin_PROGRAMS += %D%/truncate_test
scripts_zfs_tests_bin_PROGRAMS += %D%/zfs_diff-socket scripts_zfs_tests_bin_PROGRAMS += %D%/zfs_diff-socket
if WANT_UNISTD_SEEK_DATA
scripts_zfs_tests_bin_PROGRAMS += %D%/cp_files
endif
scripts_zfs_tests_bin_PROGRAMS += %D%/badsend scripts_zfs_tests_bin_PROGRAMS += %D%/badsend
%C%_badsend_LDADD = \ %C%_badsend_LDADD = \
libzfs_core.la \ libzfs_core.la \

14
tests/zfs-tests/tests/Makefile.am
View File

@ -1401,11 +1401,6 @@ nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \
functional/compression/l2arc_encrypted.ksh \ functional/compression/l2arc_encrypted.ksh \
functional/compression/l2arc_encrypted_no_compressed_arc.ksh \ functional/compression/l2arc_encrypted_no_compressed_arc.ksh \
functional/compression/setup.ksh \ functional/compression/setup.ksh \
functional/cp_files/cleanup.ksh \
functional/cp_files/cp_files_001_pos.ksh \
functional/cp_files/cp_files_002_pos.ksh \
functional/cp_files/cp_stress.ksh \
functional/cp_files/setup.ksh \
functional/crtime/cleanup.ksh \ functional/crtime/cleanup.ksh \
functional/crtime/crtime_001_pos.ksh \ functional/crtime/crtime_001_pos.ksh \
functional/crtime/setup.ksh \ functional/crtime/setup.ksh \
@ -2124,3 +2119,12 @@ nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \
functional/idmap_mount/idmap_mount_003.ksh \ functional/idmap_mount/idmap_mount_003.ksh \
functional/idmap_mount/idmap_mount_004.ksh \ functional/idmap_mount/idmap_mount_004.ksh \
functional/idmap_mount/idmap_mount_005.ksh functional/idmap_mount/idmap_mount_005.ksh
if WANT_UNISTD_SEEK_DATA
nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \
functional/cp_files/cleanup.ksh \
functional/cp_files/cp_files_001_pos.ksh \
functional/cp_files/cp_files_002_pos.ksh \
functional/cp_files/cp_stress.ksh \
functional/cp_files/setup.ksh
endif