Whamcloud - gitweb
LU-13773 tests: use TESTLOG_PREFIX in run_one_logged 52/39552/2
authorJames Nunez <jnunez@whamcloud.com>
Thu, 30 Jul 2020 22:33:32 +0000 (16:33 -0600)
committerOleg Drokin <green@whamcloud.com>
Thu, 13 Aug 2020 06:04:34 +0000 (06:04 +0000)
TESTLOG_PREFIX is defined and exported in init_test_env()
in test-framework.sh.  This environment variable is defined
as $LOGDIR/$TESTSUITE. TESTLOG_PREFIX should  be used in the
definitions of test_log and zfs_debug_log.  Since the logs
created in run_one_logged() don't use the defined prefix,
this could lead to differences in the naming of the dmesg,
debug_log and test_log logs.

Let's use TESTLOG_PREFIX in the definitions of test_log and
zfs_debug_log so that changes to the prefix are reflected in
all logs.

Signed-off-by: James Nunez <jnunez@whamcloud.com>
Change-Id: I14dbe0469b7a6627d63679103c235b97f0e42b67
Reviewed-on: https://review.whamcloud.com/39552
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Wei Liu <sarah@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Jian Yu <yujian@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

index 65aeb10..aa320f2 100755 (executable)
@@ -6545,10 +6545,8 @@ run_one_logged() {
        local testmsg=$2
        export tfile=f${testnum}.${TESTSUITE}
        export tdir=d${testnum}.${TESTSUITE}
-       local name=$TESTSUITE.$TESTNAME.test_log.$(hostname -s).log
-       local test_log=$LOGDIR/$name
-       local zfs_log_name=$TESTSUITE.$TESTNAME.zfs_log
-       local zfs_debug_log=$LOGDIR/$zfs_log_name
+       local test_log=$TESTLOG_PREFIX.$TESTNAME.test_log.$(hostname -s).log
+       local zfs_debug_log=$TESTLOG_PREFIX.$TESTNAME.zfs_log
        local SAVE_UMASK=$(umask)
        local rc=0
        umask 0022