[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-devel] [OSSTEST PATCH 10/16] mg-schema-test-database: Move setting of test_cfg_setting to dbname



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 <Ian.Jackson@xxxxxxxxxxxxx>
Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 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


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel


 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.