diff options
| author | Björn Gustavsson <[email protected]> | 2012-05-11 16:13:40 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2012-05-11 16:13:40 +0200 |
| commit | f53ec2c7e604fb03ae0e4f86695efad78ab9b339 (patch) | |
| tree | 4ef1b6eecf05d9f1dfef72050bdb5cf464602acc /lib | |
| parent | 44d6d3f913c61d09226238f37d61feb52833d5ed (diff) | |
| parent | 6cad5325cccd5be59d9bcd5d71df7be4a5ad7ae2 (diff) | |
| download | otp-f53ec2c7e604fb03ae0e4f86695efad78ab9b339.tar.gz otp-f53ec2c7e604fb03ae0e4f86695efad78ab9b339.tar.bz2 otp-f53ec2c7e604fb03ae0e4f86695efad78ab9b339.zip | |
Merge branch 'maint'
* maint:
ts: Recognize Windows 7
otp_SUITE: Ignore calls to dialyzer if the entire application is missing
otp_SUITE: Remove broken filtering of megaco calls
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/test_server/src/ts_autoconf_win32.erl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/test_server/src/ts_autoconf_win32.erl b/lib/test_server/src/ts_autoconf_win32.erl index 9103542fd2..258040b39e 100644 --- a/lib/test_server/src/ts_autoconf_win32.erl +++ b/lib/test_server/src/ts_autoconf_win32.erl @@ -67,6 +67,7 @@ system_type(Vars) -> {5,1,_} -> "Windows XP"; {5,2,_} -> "Windows 2003"; {6,0,_} -> "Windows Vista"; + {6,1,_} -> "Windows 7"; {_,_,_} -> "Windows NCC-1701-D" end; {win32, windows} -> |