Changeset: 932ed4d27024 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=932ed4d27024
Modified Files:
testing/Mtest.py.in
Branch: Oct2014
Log Message:
Further improve Mtests's single argument case.
diffs (26 lines):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -3495,7 +3495,7 @@ def main(argv) :
except monet_options.Error:
sys.exit(1)
- if len(args) == 1:
+ if len(args) == 1 and not os.path.isdir(args[0]):
head, tail = os.path.split(args[0])
if os.path.isfile(args[0]):
head, tst = os.path.split(head)
@@ -3506,9 +3506,13 @@ def main(argv) :
for ext in ('_s00.malC', '_p00.malC', '_s00.mal', '_s00.sql',
'_p00.sql', '.MAL.py', '.SQL.py', '.malC', '.mal',
'.sql', '.py', '.R', ''):
+ # extentions .in and .src are never combined
if tail.endswith(ext + '.in'):
args.append(tail[:-len(ext + '.in')])
break
+ if tail.endswith(ext + '.src'):
+ args.append(tail[:-len(ext + '.src')])
+ break
if tail.endswith(ext):
args.append(tail[:-len(ext)])
break
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
