diff options
| author | Dan Gudmundsson <dgud@erlang.org> | 2019-09-09 10:32:16 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <dgud@erlang.org> | 2019-09-09 10:32:16 +0200 |
| commit | 05ef12a0280ca19b087f8b56dfa3661309be5a9c (patch) | |
| tree | dac2a0e6a5c2eb96d274eb56cfacd97701c6bd73 /lib/common_test/test | |
| parent | 4051c15d3a71476776a3e97315e747ff678360d9 (diff) | |
| parent | fc457fa0a9a5fd1c5ba66c3a53ff84ce605f8739 (diff) | |
| download | erlang-05ef12a0280ca19b087f8b56dfa3661309be5a9c.tar.gz | |
Merge branch 'dgud/test-fixups' into maint
* dgud/test-fixups:
ct: Remove windows temp-dir workarounds
Fix debug printouts
Don't fail if crypto is not available
Avoid div zero in test_suite
Diffstat (limited to 'lib/common_test/test')
| -rw-r--r-- | lib/common_test/test/ct_test_support.erl | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/lib/common_test/test/ct_test_support.erl b/lib/common_test/test/ct_test_support.erl index 388d5d46c6..1d50f4f97f 100644 --- a/lib/common_test/test/ct_test_support.erl +++ b/lib/common_test/test/ct_test_support.erl @@ -219,17 +219,8 @@ get_opts(Config) -> end, LogDir = case os:getenv("CT_USE_TMP_DIR") of - false -> - case os:type() of - {win32,_} -> - if TempDir == undefined -> PrivDir; - true -> TempDir - end; - _ -> - PrivDir - end; - _ -> - TempDir + false -> PrivDir; + _ -> TempDir end, %% Copy test variables to app environment on new node |