Changeset: 477b432aaaff for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=477b432aaaff
Modified Files:
testing/Mtest.py.in
Branch: Aug2011
Log Message:
Deal with Tests directory in top-level of package.
diffs (24 lines):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -1117,7 +1117,10 @@ def PerformDir(env, testdir, testlist, B
env['TSTDIR'] = TSTDIR
env['TSTSRCDIR'] = TSTSRCDIR
env['TSTTRGDIR'] = TSTTRGDIR
- env['RELSRCDIR'] =
os.path.join(((os.pardir+os.sep)*(len(TSTDIR.split(os.sep))+1))+env['RELSRCBASE'],TSTDIR,TSTSUFF).replace(os.sep+os.sep,os.sep)
+ if TSTDIR == os.curdir:
+ env['RELSRCDIR'] =
os.path.join(os.pardir+os.sep+env['RELSRCBASE'],TSTSUFF).replace(os.sep+os.sep,os.sep)
+ else:
+ env['RELSRCDIR'] =
os.path.join(((os.pardir+os.sep)*(len(TSTDIR.split(os.sep))+1))+env['RELSRCBASE'],TSTDIR,TSTSUFF).replace(os.sep+os.sep,os.sep)
os.environ['TSTDB'] = TSTDB
os.environ['TSTDIR'] = TSTDIR
os.environ['TSTSRCDIR'] = TSTSRCDIR
@@ -3243,7 +3246,7 @@ def main(argv) :
RELSRCBASE = os.curdir
else:
TSTBASE =
os.path.dirname(os.path.commonprefix([os.path.normcase(env['TSTSRCBASE']),os.path.normcase(env['TSTTRGBASE'])]))
- RELBASE =
((os.pardir+os.sep)*len(env['TSTTRGBASE'][len(TSTBASE+os.sep):].split(os.sep)))
+ RELBASE =
(os.pardir+os.sep)*len(env['TSTTRGBASE'][len(TSTBASE+os.sep):].split(os.sep))
RELSRCBASE = RELBASE+env['TSTSRCBASE'][len(TSTBASE):]
env['RELSRCBASE'] = RELSRCBASE
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
