From patchwork Fri Jul 8 18:25:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 9221685 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C5E9A6089D for ; Fri, 8 Jul 2016 18:29:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BB9EB28375 for ; Fri, 8 Jul 2016 18:29:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B0A4A28387; Fri, 8 Jul 2016 18:29:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 679A82837F for ; Fri, 8 Jul 2016 18:29:01 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bLaUI-00046k-DM; Fri, 08 Jul 2016 18:26:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bLaUE-0003px-Bh for xen-devel@lists.xenproject.org; Fri, 08 Jul 2016 18:26:50 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 5B/4C-16475-A60FF775; Fri, 08 Jul 2016 18:26:50 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuplkeJIrShJLcpLzFFi42JxWrohUjfzQ32 4wbw7Whbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8bj+5eYChbzVnxbuI21gfEjVxcjJ4eEgL/E 3c3PmUFsNgFdiaYtf9m6GDk4RARUJG7vNQAxmQVCJXa8sASpEBbwlHiyfQsjSJgFqGLSSn2QM K+Ah8TxK39YIQbKSZw//hNsICdQ+a4lN9lBbCGgmuZfTWCtQgJqEnPXx0O0CkqcnPmEBcRmFp CQOPjiBTPEGG6J26enMk9g5JuFpGwWkrIFjEyrGDWKU4vKUot0jcz1kooy0zNKchMzc3QNDUz 1clOLixPTU3MSk4r1kvNzNzECg6megYFxB+PVLX6HGCU5mJREefc9qw8X4kvKT6nMSCzOiC8q zUktPsQow8GhJMHL/B4oJ1iUmp5akZaZAwxrmLQEB4+SCK8tSJq3uCAxtzgzHSJ1ilFRSpz3z TughABIIqM0D64NFkuXGGWlhHkZGRgYhHgKUotyM0tQ5V8xinMwKgnzuoOM58nMK4Gb/gpoMR PQYoMAsMUliQgpqQbGiiPlIRLd/3+9PZJTqpXvqrZrn8GEXG0r3m2TDj7Lf5EX+HBBbNF+L5m zZ6YvuZKSFfNkrdObg7rmE1MeGHDu0//Ao2YelPH3QQBrwqeCsk+GJ1uuM+y+FlV6yrn04C13 E7XgY/yHdFvnPJneIcb/NiJs43OtKX2nVWb/25J3LuOJhQoTb5WnEktxRqKhFnNRcSIA0rISO qACAAA= X-Env-Sender: prvs=9904f56b2=Ian.Jackson@citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1468002408!48935452!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27691 invoked from network); 8 Jul 2016 18:26:49 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-6.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 8 Jul 2016 18:26:49 -0000 X-IronPort-AV: E=Sophos;i="5.28,331,1464652800"; d="scan'208";a="365150979" From: Ian Jackson To: Date: Fri, 8 Jul 2016 19:25:59 +0100 Message-ID: <1468002385-4407-8-git-send-email-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1468002385-4407-1-git-send-email-ian.jackson@eu.citrix.com> References: <1468002385-4407-1-git-send-email-ian.jackson@eu.citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Jackson Subject: [Xen-devel] [OSSTEST PATCH 07/33] invoke-daemon: Honour OSSTEST_DAEMON_TCLSH X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP It appears that tcl8.5 in wheezy has a serious bug which makes `after idle' not always work. tcl8.4 has been working well in wheezy but is not in jessie, where tcl8.5 works (and tcl8.6 has a serious event loop bug - Debian #826741). So we need to use different versions of Tcl on different hosts. Allow this to be specified in ~/.xen-osstest/settings. This affects only: - invoke-daemon (which is normally run from inittab) - mg-schema-test-database sg-run-job and sg-execute-flight are not affected. They do not currently use `after idle' so that is OK for now. Signed-off-by: Ian Jackson --- invoke-daemon | 2 +- mg-schema-test-database | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/invoke-daemon b/invoke-daemon index ad1434a..e4a47bb 100755 --- a/invoke-daemon +++ b/invoke-daemon @@ -24,4 +24,4 @@ fi cd "${0%/*}" if [ "x$2" != x ]; then sleep $2; fi -exec ./$1 2>&1 | exec logger -t $1 -p local4.info +exec $OSSTEST_DAEMON_TCLSH ./$1 2>&1 | exec logger -t $1 -p local4.info diff --git a/mg-schema-test-database b/mg-schema-test-database index 892e41a..5ebba39 100755 --- a/mg-schema-test-database +++ b/mg-schema-test-database @@ -567,7 +567,15 @@ daemons) for arg in "$@"; do case "$arg" in _*) suffix="$arg" ;; - owner|queue) wantdaemons+=("./ms-${arg}daemon") ;; + owner|queue) + tcl="$(bash -ec ' + set -o posix + if [ -e $HOME/.xen-osstest/settings ]; then + source $HOME/.xen-osstest/settings + fi + echo "$OSSTEST_DAEMON_TCLSH" + ')" + wantdaemons+=("$tcl ./ms-${arg}daemon") ;; */*) wantdaemons+=("$arg") ;; *) wantdaemons+=("./$arg") ;; esac