common/config: create $RESULT_BASE before dumping kmemleak leaks

In _init_kmemleak() we're touching a check_kmemleak file in
${RESULT_BASE} if ${DEBUGFS_MNT/kmemleak} exists as a marker that we
have to check for kmemleak output after running a test.

In 'check' we're calling _init_kmemleak() at around 60% of the file,
but ${RESULT_BASE} is created later at around 62% of the file,
causing the 'touch' in _init_kmemleak() to fail.

Create the ${RESULT_BASE} just after assigning the default value in
get_next_config()

[Eryu: check for mkdir failure and remove the $RESULT_BASE creation
in check.]

Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>

diff --git a/check b/check
index 59f94c1c33f9031cdd48e8ddd2dda0eff87932ff..3de1f08676e8f53183257e136b279053045a5099 100755 (executable)
--- a/check
+++ b/check
@@ -534,13 +534,6 @@ for section in $HOST_OPTIONS_SECTIONS; do
                fi
        fi
 
                fi
        fi
 

-       mkdir -p $RESULT_BASE
-       if [ ! -d $RESULT_BASE ]; then
-               echo "failed to create results directory $RESULT_BASE"
-               status=1
-               exit
-       fi
-

        if $OPTIONS_HAVE_SECTIONS; then
                echo "SECTION       -- $section"
        fi
        if $OPTIONS_HAVE_SECTIONS; then
                echo "SECTION       -- $section"
        fi

diff --git a/common/config b/common/config
index a87cb4a2bdd55c9eeb92788d06f7dd86dbb898b3..0f153412bcdc09ffd245a3251fb778ed5b537258 100644 (file)
--- a/common/config
+++ b/common/config
@@ -657,6 +657,11 @@ get_next_config() {
        # set default RESULT_BASE
        if [ -z "$RESULT_BASE" ]; then
                export RESULT_BASE="$here/results/"
        # set default RESULT_BASE
        if [ -z "$RESULT_BASE" ]; then
                export RESULT_BASE="$here/results/"

+               mkdir -p ${RESULT_BASE}
+               if [ ! -d ${RESULT_BASE} ]; then
+                       echo "failed to create results directory $RESULT_BASE"
+                       exit 1
+               fi

        fi
 
        if [ "$FSTYP" == "tmpfs" ]; then
        fi
 
        if [ "$FSTYP" == "tmpfs" ]; then