From f3a1213c2494a73a051100db99c83e1ccb050b8e Mon Sep 17 00:00:00 2001 From: Nikolay Borisov Date: Fri, 4 Jan 2019 16:31:16 +0200 Subject: [PATCH] Revert "common/config: create $RESULT_BASE before dumping kmemleak leaks" This commit tried to fix the brokennes of the kmemleak support but it inadvertently broke the creation of the RESULT_BASE directory which lead to problems creating check.time file. Turns out kmemleak support in xfstests has more problems and it needs to be majorly refactor and this commit doesn't really solve the problem. For the time being just revert to at least allow older configuration files, which have explicitly set RESULT_BASE to work. This reverts commit 7fc034868d5dce9aaf3517c9c2197221b9a772e4. Signed-off-by: Nikolay Borisov Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- check | 7 +++++++ common/config | 5 ----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/check b/check index e4d76737..77a06b00 100755 --- a/check +++ b/check @@ -538,6 +538,13 @@ for section in $HOST_OPTIONS_SECTIONS; do 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 diff --git a/common/config b/common/config index a788be6b..64f87057 100644 --- a/common/config +++ b/common/config @@ -665,11 +665,6 @@ get_next_config() { # 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 -- 2.39.5