aboutsummaryrefslogtreecommitdiffstats
path: root/lib/test_server/src
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2012-05-11 16:12:10 +0200
committerBjörn Gustavsson <[email protected]>2012-05-11 16:12:10 +0200
commit6cad5325cccd5be59d9bcd5d71df7be4a5ad7ae2 (patch)
tree4a4c75598e30089d96f9478cb7318a7c77601dca /lib/test_server/src
parent241eab82ad76d68dbef3efdb4066d14b82fd0234 (diff)
parenta6cbd149a6f97b29f33a59c91a54b7b59048fcd1 (diff)
downloadotp-6cad5325cccd5be59d9bcd5d71df7be4a5ad7ae2.tar.gz
otp-6cad5325cccd5be59d9bcd5d71df7be4a5ad7ae2.tar.bz2
otp-6cad5325cccd5be59d9bcd5d71df7be4a5ad7ae2.zip
Merge branch 'bjorn/test-cases' into maint
* bjorn/test-cases: 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/test_server/src')
-rw-r--r--lib/test_server/src/ts_autoconf_win32.erl1
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} ->