Update of /cvsroot/monetdb/MonetDB/src/testing
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1343/MonetDB/src/testing
Modified Files:
Mfilter.py.in Mtest.py.in
Log Message:
preparing for Windows-testing, step 2:
- (for convenience) renaming "WindowsNT" into "Windows"
Index: Mtest.py.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/testing/Mtest.py.in,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -d -r1.325 -r1.326
--- Mtest.py.in 6 Dec 2007 17:33:54 -0000 1.325
+++ Mtest.py.in 6 Dec 2007 20:51:37 -0000 1.326
@@ -1522,7 +1522,7 @@
elif COND and not CONDITIONALS[COND]:
elem = SkipTest(env, TST, EXT, "as conditional '%s' does not hold." %
COND)
elif os.name == "nt" and url(TSTDIR)+"/"+TST in NotOnNT:
- elem = SkipTest(env, TST, EXT, "as it currently crashes/hangs on
WindowsNT.")
+ elem = SkipTest(env, TST, EXT, "as it currently crashes/hangs on
Windows.")
elif sys.platform == "cygwin" and url(TSTDIR)+"/"+TST in NotOnCYG:
elem = SkipTest(env, TST, EXT, "as it currently crashes/hangs on
CYGWIN.")
elif ( EXT[:4] == ".mil" or SERVER == "MIL" ) and par['M5']:
@@ -2573,9 +2573,9 @@
os.environ['HOST'] = HOST
if os.name == "nt":
- OS = "WindowsNT"
+ OS = "Windows"
RELEASE = "5.0"
- r = re.compile('^Microsoft Windows (.*) \[Version
([0-9]+\.[0-9]+)([^\[0-9].*)\]$')
+ r = re.compile('^Microsoft Windows (.*)\[Version
([0-9]+\.[0-9]+)([^\[0-9].*)\]$')
proc = subprocess.Popen('ver', stdin = subprocess.PIPE, stdout =
subprocess.PIPE, universal_newlines = True)
qOut, qErr = proc.communicate()
for l in qOut.split('\n'):
@@ -2591,7 +2591,7 @@
# this is for the wine/mingw setup
if sys.platform == 'linux2' and CONDITIONALS['CROSS_COMPILING']:
- OS = 'WindowsNT'
+ OS = 'Windows'
HOST = "WINE"
RELEASE = "5.2"
Index: Mfilter.py.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/testing/Mfilter.py.in,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -d -r1.155 -r1.156
--- Mfilter.py.in 20 Nov 2007 13:25:22 -0000 1.155
+++ Mfilter.py.in 6 Dec 2007 20:51:37 -0000 1.156
@@ -153,7 +153,7 @@
## r'^\[ [EMAIL PROTECTED],\t* [EMAIL PROTECTED] +\]$',
## r'^\[ [EMAIL PROTECTED],\t* [EMAIL PROTECTED] +\]$',
## r'^_MMjoin_18\.find\([EMAIL PROTECTED])\.print;$',
-## # src/modules/plain/salgebra (on WindowsNT):
+## # src/modules/plain/salgebra (on Windows):
## r'^\[ "batId",\t* +"(?:28|29|30|31)"\t* +\]$',
## r'^\[ (?:28|29|30|31),\t* +"ti",\t* +2,\t* +ti\t* +\]$',
## # src/modules/plain/mmath[2], tests/BugReports/Tests/no.125
(Linux.GNU.32):
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
