On 07/06, Dan Williams wrote: > On Fri, Jul 6, 2018 at 1:32 PM, Verma, Vishal L > <[email protected]> wrote: > >
[..] > > Yes, but that gets overriden by: > > https://github.com/pmem/ndctl/blob/master/test/dax.sh#L33 > > Hmm not sure. I instrumented dax-pmd.c and the shell script to dump > the rc value: > > test_dax_poison: rc: 0 > rc: 1 > FAIL dax.sh (exit status: 1) > > diff --git a/test/dax-poison.c b/test/dax-poison.c > index a25bf0b17d61..3cf2c108ca81 100644 > --- a/test/dax-poison.c > +++ b/test/dax-poison.c > @@ -145,7 +145,9 @@ clear_error: > x = *(volatile unsigned *) addr + align / 2; > rc = 0; > > + fprintf(stderr, "%s: rc: %d\n", __func__, rc); > out: > + fprintf(stderr, "%s: rc: %d\n", __func__, rc); > if (addr != MAP_FAILED) > munmap(addr, 2 * align); > free(buf); > diff --git a/test/dax.sh b/test/dax.sh > index 2a82281edb35..016fea5bb0bf 100755 > --- a/test/dax.sh > +++ b/test/dax.sh > @@ -90,4 +90,5 @@ json=$($NDCTL create-namespace -m raw -f -e $dev) > eval $(echo $json | sed -e "$json2var") > [ $mode != "fsdax" ] && echo "fail: $LINENO" && exit 1 > > -exit 0 > +echo "rc: $rc" > +exit $rc I went with the following since the original patch could potentially lose an rc=77 status. 8<---- >From 5f6e14c827c068ad892b4451844b4ad2135f2696 Mon Sep 17 00:00:00 2001 From: Vishal Verma <[email protected]> Date: Fri, 6 Jul 2018 15:55:43 -0600 Subject: [ndctl PATCH] ndctl, test: Fix dax.sh return code Commit 11b349b5236e "ndctl, test: Disable poison tests for now" inadvertently prevented the dax.sh test from ever succeeding. Make sure the test function actually overrides rc every time instead of only when there is an error so we don't propagate the initial rc=1 all the way to the end. Fixes: 11b349b5236e ("ndctl, test: Disable poison tests for now") Based-on-patch-by: Dan Williams <[email protected]> Cc: Dan Williams <[email protected]> Signed-off-by: Vishal Verma <[email protected]> --- test/dax.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/test/dax.sh b/test/dax.sh index 30fe167..b63d563 100755 --- a/test/dax.sh +++ b/test/dax.sh @@ -29,6 +29,7 @@ err() { } run_test() { + rc=0 if ! ./dax-pmd $MNT/$FILE; then rc=$? if [ $rc -ne 77 -a $rc -ne 0 ]; then -- 2.14.4 _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
