Update of /cvsroot/monetdb/MonetDB/src/testing
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9573/src/testing
Modified Files:
Mtest.py.in
Log Message:
use output of Windows' "ver" command to find out the actual WindowsNT version
number;
(as far as I know / could find out so far, Microsoft assign(ed|s) version
numbers as follows:
WindowsNT 4.0 <= WindowsNT
WindowsNT 5.0 <= Windows2000
WindowsNT 5.1 <= WindowsXP
WindowsNT 5.2 <= Windows Server 2003
WindowsNT ?.? <= Windows Vista
)
Index: Mtest.py.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/testing/Mtest.py.in,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -d -r1.322 -r1.323
--- Mtest.py.in 15 Nov 2007 18:37:08 -0000 1.322
+++ Mtest.py.in 21 Nov 2007 14:45:28 -0000 1.323
@@ -2584,10 +2584,14 @@
if os.name == "nt":
OS = "WindowsNT"
- if HOST == "WIN2000":
- RELEASE = "5.0"
- else:
- RELEASE = "5.2"
+ RELEASE = "5.0"
+ 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'):
+ m = r.match(i.strip())
+ if m and m.group(2):
+ RELEASE = m.group(2)
else:
OS = os.uname()[0].split("_NT-", 1)[0]
if OS == "AIX":
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
