| Message ID | 166188306499.3409478.15310054338186313752.stgit@dwillia2-xfh.jf.intel.com |
|---|---|
| State | Accepted |
| Commit | 4a847551aada9d6607c6edb219ce429f59332d6d |
| Headers | show |
| Series | [ndctl] cxl/test: Skip tests in the absence of the cxl_test module | expand |
Tested-by: Yi Zhang <yi.zhang@redhat.com> # meson test --suite cxl -C build ninja: Entering directory `/root/ndctl/build' [1/44] Generating version.h with a custom command 1/4 ndctl:cxl / cxl-topology.sh SKIP 0.08s exit status 77 2/4 ndctl:cxl / cxl-region-sysfs.sh SKIP 0.08s exit status 77 3/4 ndctl:cxl / cxl-labels.sh SKIP 0.08s exit status 77 4/4 ndctl:cxl / cxl-create-region.sh SKIP 0.08s exit status 77 Ok: 0 Expected Fail: 0 Fail: 0 Unexpected Pass: 0 Skipped: 4 Timeout: 0 Full log written to /root/ndctl/build/meson-logs/testlog.txt On Wed, Aug 31, 2022 at 2:12 AM Dan Williams <dan.j.williams@intel.com> wrote: > > Similar to cases when nfit_test is missing, SKIP rather than FAIL the tests > that depend on cxl_test.ko when it is missing. > > Link: https://github.com/pmem/ndctl/issues/221 > Reported-by: Yi Zhang <yi.zhang@redhat.com> > Signed-off-by: Dan Williams <dan.j.williams@intel.com> > --- > test/cxl-create-region.sh | 3 ++- > test/cxl-labels.sh | 3 ++- > test/cxl-region-sysfs.sh | 3 ++- > test/cxl-topology.sh | 3 ++- > 4 files changed, 8 insertions(+), 4 deletions(-) > > diff --git a/test/cxl-create-region.sh b/test/cxl-create-region.sh > index 66df38f41549..82aad3a7285a 100644 > --- a/test/cxl-create-region.sh > +++ b/test/cxl-create-region.sh > @@ -4,7 +4,7 @@ > > . $(dirname $0)/common > > -rc=1 > +rc=77 > > set -ex > > @@ -14,6 +14,7 @@ check_prereq "jq" > > modprobe -r cxl_test > modprobe cxl_test > +rc=1 > udevadm settle > > destroy_regions() > diff --git a/test/cxl-labels.sh b/test/cxl-labels.sh > index e782e2dec246..3bf1e6e995b6 100644 > --- a/test/cxl-labels.sh > +++ b/test/cxl-labels.sh > @@ -4,7 +4,7 @@ > > . $(dirname $0)/common > > -rc=1 > +rc=77 > > set -ex > > @@ -14,6 +14,7 @@ check_prereq "jq" > > modprobe -r cxl_test > modprobe cxl_test > +rc=1 > udevadm settle > > test_label_ops() > diff --git a/test/cxl-region-sysfs.sh b/test/cxl-region-sysfs.sh > index ae0f55653814..63186b60dfec 100644 > --- a/test/cxl-region-sysfs.sh > +++ b/test/cxl-region-sysfs.sh > @@ -4,7 +4,7 @@ > > . $(dirname $0)/common > > -rc=1 > +rc=77 > > set -ex > > @@ -14,6 +14,7 @@ check_prereq "jq" > > modprobe -r cxl_test > modprobe cxl_test > +rc=1 > udevadm settle > > # THEORY OF OPERATION: Create a x8 interleave across the pmem capacity > diff --git a/test/cxl-topology.sh b/test/cxl-topology.sh > index f7da83e60f7a..5148e6dd79f4 100644 > --- a/test/cxl-topology.sh > +++ b/test/cxl-topology.sh > @@ -4,7 +4,7 @@ > > . $(dirname $0)/common > > -rc=1 > +rc=77 > > set -ex > > @@ -14,6 +14,7 @@ check_prereq "jq" > > modprobe -r cxl_test > modprobe cxl_test > +rc=1 > udevadm settle > > # THEORY OF OPERATION: Validate the hard coded assumptions of the >
diff --git a/test/cxl-create-region.sh b/test/cxl-create-region.sh index 66df38f41549..82aad3a7285a 100644 --- a/test/cxl-create-region.sh +++ b/test/cxl-create-region.sh @@ -4,7 +4,7 @@ . $(dirname $0)/common -rc=1 +rc=77 set -ex @@ -14,6 +14,7 @@ check_prereq "jq" modprobe -r cxl_test modprobe cxl_test +rc=1 udevadm settle destroy_regions() diff --git a/test/cxl-labels.sh b/test/cxl-labels.sh index e782e2dec246..3bf1e6e995b6 100644 --- a/test/cxl-labels.sh +++ b/test/cxl-labels.sh @@ -4,7 +4,7 @@ . $(dirname $0)/common -rc=1 +rc=77 set -ex @@ -14,6 +14,7 @@ check_prereq "jq" modprobe -r cxl_test modprobe cxl_test +rc=1 udevadm settle test_label_ops() diff --git a/test/cxl-region-sysfs.sh b/test/cxl-region-sysfs.sh index ae0f55653814..63186b60dfec 100644 --- a/test/cxl-region-sysfs.sh +++ b/test/cxl-region-sysfs.sh @@ -4,7 +4,7 @@ . $(dirname $0)/common -rc=1 +rc=77 set -ex @@ -14,6 +14,7 @@ check_prereq "jq" modprobe -r cxl_test modprobe cxl_test +rc=1 udevadm settle # THEORY OF OPERATION: Create a x8 interleave across the pmem capacity diff --git a/test/cxl-topology.sh b/test/cxl-topology.sh index f7da83e60f7a..5148e6dd79f4 100644 --- a/test/cxl-topology.sh +++ b/test/cxl-topology.sh @@ -4,7 +4,7 @@ . $(dirname $0)/common -rc=1 +rc=77 set -ex @@ -14,6 +14,7 @@ check_prereq "jq" modprobe -r cxl_test modprobe cxl_test +rc=1 udevadm settle # THEORY OF OPERATION: Validate the hard coded assumptions of the
Similar to cases when nfit_test is missing, SKIP rather than FAIL the tests that depend on cxl_test.ko when it is missing. Link: https://github.com/pmem/ndctl/issues/221 Reported-by: Yi Zhang <yi.zhang@redhat.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com> --- test/cxl-create-region.sh | 3 ++- test/cxl-labels.sh | 3 ++- test/cxl-region-sysfs.sh | 3 ++- test/cxl-topology.sh | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-)