From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Jackson Subject: [OSSTEST PATCH 10/16] mg-schema-test-database: Move setting of test_cfg_setting to dbname Date: Mon, 7 Dec 2015 17:27:28 +0000 Message-ID: <1449509254-27007-11-git-send-email-ian.jackson@eu.citrix.com> References: <1449509254-27007-1-git-send-email-ian.jackson@eu.citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a5zZk-000898-HB for xen-devel@lists.xenproject.org; Mon, 07 Dec 2015 17:27:48 +0000 In-Reply-To: <1449509254-27007-1-git-send-email-ian.jackson@eu.citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xenproject.org Cc: Ian Jackson , Ian Campbell List-Id: xen-devel@lists.xenproject.org This will makes it available to a wider subset of the script, which is going to be important in a moment. No functional change. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- mg-schema-test-database | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mg-schema-test-database b/mg-schema-test-database index 1226761..a1eb49c 100755 --- a/mg-schema-test-database +++ b/mg-schema-test-database @@ -56,6 +56,12 @@ dbname () { dbname="${maindbname}_test$suffix" t="tmp/testdb$suffix" tcfg=local-config.test-database$suffix + + test_cfg_setting="$(perl -we ' + use Osstest; + print globalconfigfiles() or die $!; + '):$tcfg" + } psql_query_internal () { @@ -254,12 +260,6 @@ END ' mv -f $tcfg.tmp $tcfg - # this makes `withtest' work - test_cfg_setting="$(perl -we ' - use Osstest; - print globalconfigfiles() or die $!; - '):$tcfg" - # Extract the schema for reference $(get_pgdump_cmd) -s -O -x >$t.schema -- 1.7.10.4