[LU-11010] Remove call to ‘return’ after call to ‘skip’ in Lustre test suites

Related — Mon, 8 Apr 2019 14:20:02 +0000

With the patch for ~~LU-10461~~, https://review.whamcloud.com/30964, a call to exit was included in skip() and a skip_noexit() routine was created.

5776 skip_noexit() {
5777         echo
5778         log " SKIP: $TESTSUITE $TESTNAME $@"
5779 
5780         if [[ -n "$ALWAYS_SKIPPED" ]]; then
5781                 skip_logged $TESTNAME "$@"
5782         else
5783                 mkdir -p $LOGDIR
5784                 echo "$@" > $LOGDIR/skip
5785         fi
5786 
5787         [[ -n "$TESTSUITELOG" ]] &&
5788                 echo "$TESTSUITE: SKIP: $TESTNAME $@" >> $TESTSUITELOG || true
5789 }
5790 
5791 skip() {
5792         skip_noexit
5793         exit 0
5794 }

Tests that have calls to skip() or skip_env() should be reviewed to see if they should be converted to skip_noexit() or remove the call to return that follows the call to skip.

Whamcloud Community JIRA

[LU-11010] Remove call to ‘return’ after call to ‘skip’ in Lustre test suites