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

ZTS: Adapt casenorm tests for FreeBSD 

Several casenorm tests pass on FreeBSD but are expected to fail on
Linux.

Move the passing tests from "fail" to "maybe" so that passing on
FreeBSD is not unexpected.

Invert platform logic so FreeBSD doesn't use illumos-only zlook.

Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Igor Kozhukhov <igor@dilos.org>
Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
Closes #10050
This commit is contained in:
Ryan Moeller 2020-02-26 11:41:30 -05:00 committed by GitHub
parent 3a192f7d89
commit abef699866
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,12 +145,8 @@ summary = {
# reasons listed above can be used. # reasons listed above can be used.
# #
known = { known = {
'casenorm/sensitive_formd_lookup': ['FAIL', '7633'],
'casenorm/sensitive_formd_delete': ['FAIL', '7633'],
'casenorm/mixed_none_lookup_ci': ['FAIL', '7633'], 'casenorm/mixed_none_lookup_ci': ['FAIL', '7633'],
'casenorm/mixed_formd_lookup': ['FAIL', '7633'],
'casenorm/mixed_formd_lookup_ci': ['FAIL', '7633'], 'casenorm/mixed_formd_lookup_ci': ['FAIL', '7633'],
'casenorm/mixed_formd_delete': ['FAIL', '7633'],
'cli_root/zfs_receive/zfs_receive_004_neg': ['FAIL', known_reason], 'cli_root/zfs_receive/zfs_receive_004_neg': ['FAIL', known_reason],
'cli_root/zfs_unshare/zfs_unshare_002_pos': ['SKIP', na_reason], 'cli_root/zfs_unshare/zfs_unshare_002_pos': ['SKIP', na_reason],
'cli_root/zfs_unshare/zfs_unshare_006_pos': ['SKIP', na_reason], 'cli_root/zfs_unshare/zfs_unshare_006_pos': ['SKIP', na_reason],
@ -177,6 +173,10 @@ known = {
# #
maybe = { maybe = {
'cache/cache_010_neg': ['FAIL', known_reason], 'cache/cache_010_neg': ['FAIL', known_reason],
'casenorm/mixed_formd_lookup': ['FAIL', '7633'],
'casenorm/mixed_formd_delete': ['FAIL', '7633'],
'casenorm/sensitive_formd_lookup': ['FAIL', '7633'],
'casenorm/sensitive_formd_delete': ['FAIL', '7633'],
'chattr/setup': ['SKIP', exec_reason], 'chattr/setup': ['SKIP', exec_reason],
'cli_root/zdb/zdb_006_pos': ['FAIL', known_reason], 'cli_root/zdb/zdb_006_pos': ['FAIL', known_reason],
'cli_root/zfs_get/zfs_get_004_pos': ['FAIL', known_reason], 'cli_root/zfs_get/zfs_get_004_pos': ['FAIL', known_reason],

12
tests/zfs-tests/tests/functional/casenorm/casenorm.kshlib
View File

@ -65,10 +65,10 @@ function lookup_file
{ {
typeset name=$1 typeset name=$1
if is_linux; then if is_illumos; then
test -f "${TESTDIR}/${name}" >/dev/null 2>&1
else
zlook -l $TESTDIR $name >/dev/null 2>&1 zlook -l $TESTDIR $name >/dev/null 2>&1
else
test -f "${TESTDIR}/${name}" >/dev/null 2>&1
fi fi
} }
@ -76,10 +76,10 @@ function lookup_file_ci
{ {
typeset name=$1 typeset name=$1
if is_linux; then if is_illumos; then
test -f "${TESTDIR}/${name}" >/dev/null 2>&1
else
zlook -il $TESTDIR $name >/dev/null 2>&1 zlook -il $TESTDIR $name >/dev/null 2>&1
else
test -f "${TESTDIR}/${name}" >/dev/null 2>&1
fi fi
} }