diff options
| author | Ryan Moeller <[email protected]> | 2020-02-26 11:41:30 -0500 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-02-26 08:41:30 -0800 |
| commit | abef699866508f96157290e2a85482968e094a58 (patch) | |
| tree | 58c3e36f4b472dff51a37e7deef8cf57249320be | |
| parent | 3a192f7d898e78dfdf5c2f7b2dd983b23eaf25f6 (diff) | |
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 <[email protected]>
Reviewed-by: Igor Kozhukhov <[email protected]>
Reviewed-by: John Kennedy <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ryan Moeller <[email protected]>
Closes #10050
| -rwxr-xr-x | tests/test-runner/bin/zts-report.py | 8 | ||||
| -rw-r--r-- | tests/zfs-tests/tests/functional/casenorm/casenorm.kshlib | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/tests/test-runner/bin/zts-report.py b/tests/test-runner/bin/zts-report.py index c5a1a2c3b..111686920 100755 --- a/tests/test-runner/bin/zts-report.py +++ b/tests/test-runner/bin/zts-report.py @@ -145,12 +145,8 @@ summary = { # reasons listed above can be used. # known = { - 'casenorm/sensitive_formd_lookup': ['FAIL', '7633'], - 'casenorm/sensitive_formd_delete': ['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_delete': ['FAIL', '7633'], '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_006_pos': ['SKIP', na_reason], @@ -177,6 +173,10 @@ known = { # maybe = { '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], 'cli_root/zdb/zdb_006_pos': ['FAIL', known_reason], 'cli_root/zfs_get/zfs_get_004_pos': ['FAIL', known_reason], diff --git a/tests/zfs-tests/tests/functional/casenorm/casenorm.kshlib b/tests/zfs-tests/tests/functional/casenorm/casenorm.kshlib index 5b080165b..cb61798d7 100644 --- a/tests/zfs-tests/tests/functional/casenorm/casenorm.kshlib +++ b/tests/zfs-tests/tests/functional/casenorm/casenorm.kshlib @@ -65,10 +65,10 @@ function lookup_file { typeset name=$1 - if is_linux; then - test -f "${TESTDIR}/${name}" >/dev/null 2>&1 - else + if is_illumos; then zlook -l $TESTDIR $name >/dev/null 2>&1 + else + test -f "${TESTDIR}/${name}" >/dev/null 2>&1 fi } @@ -76,10 +76,10 @@ function lookup_file_ci { typeset name=$1 - if is_linux; then - test -f "${TESTDIR}/${name}" >/dev/null 2>&1 - else + if is_illumos; then zlook -il $TESTDIR $name >/dev/null 2>&1 + else + test -f "${TESTDIR}/${name}" >/dev/null 2>&1 fi } |