Uploaded image for project: 'Lustre'
  1. Lustre
  2. LU-11010

Remove call to ‘return’ after call to ‘skip’ in Lustre test suites

Details

    • 9223372036854775807

    Description

      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.

      Attachments

        Issue Links

          Activity

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

            Oleg Drokin (green@whamcloud.com) merged in patch https://review.whamcloud.com/34565/
            Subject: LU-11010 tests: remove return after skip for conf-sanity
            Project: fs/lustre-release
            Branch: b2_12
            Current Patch Set:
            Commit: cd8a8949ba6d618394ec4ac3db60e41b8943ed8f

            gerrit Gerrit Updater added a comment - Oleg Drokin (green@whamcloud.com) merged in patch https://review.whamcloud.com/34565/ Subject: LU-11010 tests: remove return after skip for conf-sanity Project: fs/lustre-release Branch: b2_12 Current Patch Set: Commit: cd8a8949ba6d618394ec4ac3db60e41b8943ed8f

            Minh Diep (mdiep@whamcloud.com) uploaded a new patch: https://review.whamcloud.com/34565
            Subject: LU-11010 tests: remove return after skip for conf-sanity
            Project: fs/lustre-release
            Branch: b2_12
            Current Patch Set: 1
            Commit: c6a6c3f98646b4a20880453b5e3376dc2682eff5

            gerrit Gerrit Updater added a comment - Minh Diep (mdiep@whamcloud.com) uploaded a new patch: https://review.whamcloud.com/34565 Subject: LU-11010 tests: remove return after skip for conf-sanity Project: fs/lustre-release Branch: b2_12 Current Patch Set: 1 Commit: c6a6c3f98646b4a20880453b5e3376dc2682eff5
            pjones Peter Jones added a comment -

            Landed for 2.13

            pjones Peter Jones added a comment - Landed for 2.13

            Oleg Drokin (green@whamcloud.com) merged in patch https://review.whamcloud.com/32735/
            Subject: LU-11010 tests: remove return after skip for conf-sanity
            Project: fs/lustre-release
            Branch: master
            Current Patch Set:
            Commit: 915b16cf1278026a9f914f268e8cdfb578d929c4

            gerrit Gerrit Updater added a comment - Oleg Drokin (green@whamcloud.com) merged in patch https://review.whamcloud.com/32735/ Subject: LU-11010 tests: remove return after skip for conf-sanity Project: fs/lustre-release Branch: master Current Patch Set: Commit: 915b16cf1278026a9f914f268e8cdfb578d929c4

            Oleg Drokin (green@whamcloud.com) merged in patch https://review.whamcloud.com/34199/
            Subject: LU-11010 tests: remove calls to return after skip()
            Project: fs/lustre-release
            Branch: b2_10
            Current Patch Set:
            Commit: f8bb7b1a04543de759b863ee06cfccb83d908856

            gerrit Gerrit Updater added a comment - Oleg Drokin (green@whamcloud.com) merged in patch https://review.whamcloud.com/34199/ Subject: LU-11010 tests: remove calls to return after skip() Project: fs/lustre-release Branch: b2_10 Current Patch Set: Commit: f8bb7b1a04543de759b863ee06cfccb83d908856

            James Nunez (jnunez@whamcloud.com) uploaded a new patch: https://review.whamcloud.com/34199
            Subject: LU-11010 tests: remove calls to return after skip()
            Project: fs/lustre-release
            Branch: b2_10
            Current Patch Set: 1
            Commit: 37a672a7f209ab5c9a8e7dfc051ac4ea9a254355

            gerrit Gerrit Updater added a comment - James Nunez (jnunez@whamcloud.com) uploaded a new patch: https://review.whamcloud.com/34199 Subject: LU-11010 tests: remove calls to return after skip() Project: fs/lustre-release Branch: b2_10 Current Patch Set: 1 Commit: 37a672a7f209ab5c9a8e7dfc051ac4ea9a254355

            Oleg Drokin (green@whamcloud.com) merged in patch https://review.whamcloud.com/32733/
            Subject: LU-11010 tests: remove calls to return after skip()
            Project: fs/lustre-release
            Branch: master
            Current Patch Set:
            Commit: e2226ae35978f223bf851dabf15eb6b606da8020

            gerrit Gerrit Updater added a comment - Oleg Drokin (green@whamcloud.com) merged in patch https://review.whamcloud.com/32733/ Subject: LU-11010 tests: remove calls to return after skip() Project: fs/lustre-release Branch: master Current Patch Set: Commit: e2226ae35978f223bf851dabf15eb6b606da8020

            Two more patches need a little work and need to land to finish up this work;
            https://review.whamcloud.com/#/c/32735/
            https://review.whamcloud.com/#/c/32733/

            jamesanunez James Nunez (Inactive) added a comment - Two more patches need a little work and need to land to finish up this work; https://review.whamcloud.com/#/c/32735/ https://review.whamcloud.com/#/c/32733/
            pjones Peter Jones added a comment -

            jamesanunez so is that the lot now?

            pjones Peter Jones added a comment - jamesanunez so is that the lot now?

            Oleg Drokin (green@whamcloud.com) merged in patch https://review.whamcloud.com/32732/
            Subject: LU-11010 tests: remove calls to return after skip()
            Project: fs/lustre-release
            Branch: master
            Current Patch Set:
            Commit: a72a949be47fc317de5d1cbcde7d79a5dad91e64

            gerrit Gerrit Updater added a comment - Oleg Drokin (green@whamcloud.com) merged in patch https://review.whamcloud.com/32732/ Subject: LU-11010 tests: remove calls to return after skip() Project: fs/lustre-release Branch: master Current Patch Set: Commit: a72a949be47fc317de5d1cbcde7d79a5dad91e64

            People

              jamesanunez James Nunez (Inactive)
              jamesanunez James Nunez (Inactive)
              Votes:
              0 Vote for this issue
              Watchers:
              3 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: