From owner-svn-src-user@FreeBSD.ORG Wed Jan 8 18:16:41 2014 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 82116C60; Wed, 8 Jan 2014 18:16:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6E739132D; Wed, 8 Jan 2014 18:16:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s08IGfJo001050; Wed, 8 Jan 2014 18:16:41 GMT (envelope-from jmmv@svn.freebsd.org) Received: (from jmmv@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08IGfMH001049; Wed, 8 Jan 2014 18:16:41 GMT (envelope-from jmmv@svn.freebsd.org) Message-Id: <201401081816.s08IGfMH001049@svn.freebsd.org> From: Julio Merino Date: Wed, 8 Jan 2014 18:16:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r260454 - user/jmmv/autotest/node X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Jan 2014 18:16:41 -0000 Author: jmmv Date: Wed Jan 8 18:16:40 2014 New Revision: 260454 URL: http://svnweb.freebsd.org/changeset/base/260454 Log: Fix creation of the 0-LATEST directory. I'm not exactly sure why it was broken in an odd way though, but this seems to fix it. Should take a closer look later. Modified: user/jmmv/autotest/node/iterate.sh Modified: user/jmmv/autotest/node/iterate.sh ============================================================================== --- user/jmmv/autotest/node/iterate.sh Wed Jan 8 17:16:24 2014 (r260453) +++ user/jmmv/autotest/node/iterate.sh Wed Jan 8 18:16:40 2014 (r260454) @@ -302,25 +302,27 @@ autotest_all() { [ ${#} -eq 0 ] || shtk_cli_usage_error "all does not take any arguments" local timestamp=$(date +%Y%m%d-%H%M%S) - local datadir="$(shtk_config_get DATADIR)/${timestamp}" + local datadir="$(shtk_config_get DATADIR)" + local run_datadir="${datadir}/${timestamp}" - mkdir -p "${datadir}" - touch "${datadir}/output.log" + mkdir -p "${run_datadir}" + touch "${run_datadir}/output.log" if ! shtk_bool_check "${quiet}"; then - tail -f "${datadir}/output.log" & + tail -f "${run_datadir}/output.log" & local tail_pid="${!}" eval "kill_tail() { kill '${tail_pid}'; }" shtk_cleanup_register kill_tail fi - exec >>"${datadir}/output.log" 2>&1 + exec >>"${run_datadir}/output.log" 2>&1 ( autotest_release autotest_mkimage autotest_execute - autotest_publish "${datadir}" + autotest_publish "${run_datadir}" ) - ln -sf "${timestamp}" "$(shtk_config_get DATADIR)/0-LATEST" + rm -f "${datadir}/0-LATEST" + ln -s "${timestamp}" "${datadir}/0-LATEST" exec >&- 2>&- if ! shtk_bool_check "${quiet}"; then