diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2009-10-07 18:18:37 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2009-10-07 18:18:37 +0200 |
| commit | 5fc2dc27228263e4c56ba3a49852ab3f8c724299 (patch) | |
| tree | a1340491094705a1e604a3df22ec4dad0c8d1a8e /scripts/TestUtil.py | |
| parent | Bug 4251 - add IceUtil::Time double initializers (diff) | |
| download | ice-5fc2dc27228263e4c56ba3a49852ab3f8c724299.tar.bz2 ice-5fc2dc27228263e4c56ba3a49852ab3f8c724299.tar.xz ice-5fc2dc27228263e4c56ba3a49852ab3f8c724299.zip | |
- Bug 4286: added support for IceStorm/IceGrid database plugins
- Fixed IceGrid database code to first save to the database and then
do state changes.
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 2f68f327e38..79940354396 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -852,16 +852,18 @@ def getDefaultCollocatedFile(): def isDebug(): return debug -def getQtSqlOptions(prefix, dataDir): +def getQtSqlOptions(prefix, dataDir = None): if sqlType == None: - return "" + return ''; - options = '--' + prefix+ '.SQL.DatabaseType=' + sqlType + options = '--Ice.Plugin.DB=' + prefix + 'SqlDB:createSqlDB'; + options += ' --' + prefix+ '.SQL.DatabaseType=' + sqlType options += ' --' + prefix+ '.SQL.DatabaseName=' if sqlDbName == None: if sqlType == "QSQLITE": - options += dataDir + '/SQL.db' + if dataDir != None: + options += dataDir + '/SQL.db' elif sqlType == "QODBC": options += 'testdsn' else: @@ -888,9 +890,6 @@ def getQtSqlOptions(prefix, dataDir): if sqlPassword != None: options += sqlPassword - if prefix == "IceStorm": - options += ' --Ice.Plugin.SQLThreadHook=IceStormService:createThreadHook' - return options import Expect |