diff options
| author | Peter Andersson <[email protected]> | 2015-12-11 09:37:31 +0100 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2015-12-11 09:37:31 +0100 |
| commit | 46385b509ee1e26defe22aaf4245c90e3c0014b9 (patch) | |
| tree | e1d064768c673001e758b5e2ad38e47b221675f9 /lib/test_server | |
| parent | 75bf5a71b5fdac521430fb0205702079b14ab5b3 (diff) | |
| parent | 27659d4f0b917a4540dee46af2e0702cfcf56c63 (diff) | |
| download | otp-46385b509ee1e26defe22aaf4245c90e3c0014b9.tar.gz otp-46385b509ee1e26defe22aaf4245c90e3c0014b9.tar.bz2 otp-46385b509ee1e26defe22aaf4245c90e3c0014b9.zip | |
Merge branch 'peppe/common_test/priv_dir_mode_bug' into maint
* peppe/common_test/priv_dir_mode_bug:
Make sure priv_dir names don't cause name clashes
OTP-13181
Diffstat (limited to 'lib/test_server')
| -rw-r--r-- | lib/test_server/src/test_server_ctrl.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/test_server/src/test_server_ctrl.erl b/lib/test_server/src/test_server_ctrl.erl index 0be6e0b4e4..8a46996bc3 100644 --- a/lib/test_server/src/test_server_ctrl.erl +++ b/lib/test_server/src/test_server_ctrl.erl @@ -3711,8 +3711,8 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit, RunDir = filename:dirname(MinorName), Ext = if Num == 0 -> - Nr = erlang:unique_integer([positive]), - lists:flatten(io_lib:format(".~w", [Nr])); + Int = erlang:unique_integer([positive,monotonic]), + lists:flatten(io_lib:format(".cfg.~w", [Int])); true -> lists:flatten(io_lib:format(".~w", [Num])) end, |