Changeset: 1f0ec7584c2c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1f0ec7584c2c
Modified Files:
        gdk/gdk_bat.mx
        sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.py
Branch: default
Log Message:

Merge with Apr2012 branch.


diffs (25 lines):

diff --git a/sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.py 
b/sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.py
--- a/sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.py
+++ b/sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.py
@@ -4,6 +4,19 @@ except ImportError:
     import process
 import os
 
-s = process.server(args = ['--readonly'],
-                   dbname = '%s-2695' % os.getenv('TSTDB'))
+dbfarm = os.getenv('GDK_DBFARM')
+tstdb = os.getenv('TSTDB')
+
+if not tstdb or not dbfarm:
+    print 'No TSTDB or GDK_DBFARM in environment'
+    sys.exit(1)
+
+dbname = tstdb + '-2695'
+
+# clean up before we start
+if os.path.exists(os.path.join(dbfarm, dbname)):
+    import shutil
+    shutil.rmtree(os.path.join(dbfarm, dbname))
+
+s = process.server(args = ['--readonly'], dbname = dbname)
 s.wait()
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to