Update of /cvsroot/monetdb/MonetDB/src/testing
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27045/src/testing
Modified Files:
Tag: GDK-2
Mtest.py.in
Log Message:
propagated changes of Monday Sep 24 2007 - Wednesday Oct 03 2007
from the development trunk to the GDK-2 branch
Index: Mtest.py.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/testing/Mtest.py.in,v
retrieving revision 1.280.2.8
retrieving revision 1.280.2.9
diff -u -d -r1.280.2.8 -r1.280.2.9
--- Mtest.py.in 24 Sep 2007 09:20:27 -0000 1.280.2.8
+++ Mtest.py.in 3 Oct 2007 14:50:37 -0000 1.280.2.9
@@ -155,8 +155,6 @@
# hence, we set them at runtime in main() below
'HAVE_MONETDB5' : "@HAVE_MONETDB5_FALSE@",
'HAVE_MONETDB4' : "@HAVE_MONETDB4_FALSE@",
- 'MONET4' : "@MONET4_FALSE@",
- 'MONET5' : "@MONET5_FALSE@",
}
# a bunch of classes to help with generating (X)HTML files
@@ -1100,9 +1098,7 @@
for ext in ".exe", ".com", ".bat", ".cmd":
if TST.lower().endswith(ext):
ext = ''
- else:
- TST = TST + ext
- if os.path.isfile(TST) or os.path.isfile(TST+".src"):
+ if os.path.isfile(TST+ext) or os.path.isfile(TST+ext+".src"):
return [ 1, ext ]
elif os.name == "posix":
#TODO:
@@ -2934,13 +2930,9 @@
if par['M5']:
CONDITIONALS['HAVE_MONETDB5'] = '#'
CONDITIONALS['HAVE_MONETDB4'] = ''
- CONDITIONALS['MONET4'] = ''
- CONDITIONALS['MONET5'] = '#'
else:
CONDITIONALS['HAVE_MONETDB5'] = ''
CONDITIONALS['HAVE_MONETDB4'] = '#'
- CONDITIONALS['MONET4'] = '#'
- CONDITIONALS['MONET5'] = ''
#if env.has_key('MONETDB_PREFIX'):
#bp = os.path.join(env['MONETDB_PREFIX'],"bin")
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
