aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2011-04-14 18:04:30 +0200
committerPeter Andersson <[email protected]>2011-04-28 22:43:53 +0200
commit7212d250ad3383b83de814646f038f7a77373b6f (patch)
treedfb87032a2128325c57b2863fc729c81011c1823 /lib/common_test
parent4e1b099698aac698f89ca172b62ba2330c85ad90 (diff)
downloadotp-7212d250ad3383b83de814646f038f7a77373b6f.tar.gz
otp-7212d250ad3383b83de814646f038f7a77373b6f.tar.bz2
otp-7212d250ad3383b83de814646f038f7a77373b6f.zip
Fix failing tests on Windows.
Diffstat (limited to 'lib/common_test')
-rw-r--r--lib/common_test/test/ct_test_support.erl6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/common_test/test/ct_test_support.erl b/lib/common_test/test/ct_test_support.erl
index bb142696fa..d8b3daaab8 100644
--- a/lib/common_test/test/ct_test_support.erl
+++ b/lib/common_test/test/ct_test_support.erl
@@ -212,7 +212,11 @@ get_opts(Config) ->
end,
%% test_server:format("Test variables added to Config: ~p\n\n",
%% [CtTestVars]),
- InitOpts = proplists:get_value(ct_opts, Config),
+ InitOpts =
+ case proplists:get_value(ct_opts, Config) of
+ undefined -> [];
+ CtOpts -> CtOpts
+ end,
[{logdir,LogDir} | InitOpts ++ CtTestVars].