diff options
| author | Peter Andersson <[email protected]> | 2016-04-29 14:00:14 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2016-05-02 14:09:46 +0200 |
| commit | 44082e24cf0b649792b83c6e5c8f07b17586aeaf (patch) | |
| tree | 698d333be5312d6894639d79e36e688c62964d92 /lib/common_test/test/ct_test_support.erl | |
| parent | af1135e7e7c1a8d572e2fe152dad55d84b42b7cb (diff) | |
| download | otp-44082e24cf0b649792b83c6e5c8f07b17586aeaf.tar.gz otp-44082e24cf0b649792b83c6e5c8f07b17586aeaf.tar.bz2 otp-44082e24cf0b649792b83c6e5c8f07b17586aeaf.zip | |
Fix bug with clashing timestamp values
Diffstat (limited to 'lib/common_test/test/ct_test_support.erl')
| -rw-r--r-- | lib/common_test/test/ct_test_support.erl | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/lib/common_test/test/ct_test_support.erl b/lib/common_test/test/ct_test_support.erl index 8e7ac9395c..493fa82c79 100644 --- a/lib/common_test/test/ct_test_support.erl +++ b/lib/common_test/test/ct_test_support.erl @@ -43,6 +43,8 @@ -export([random_error/1]). +-export([unique_timestamp/0]). + -include_lib("kernel/include/file.hrl"). %%%----------------------------------------------------------------- @@ -110,7 +112,8 @@ start_slave(NodeName, Config, Level) -> undefined -> []; Ds -> Ds end, - PathDirs = [PrivDir,TSDir | AddPathDirs], + TestSupDir = filename:dirname(code:which(?MODULE)), + PathDirs = [PrivDir,TSDir,TestSupDir | AddPathDirs], [true = rpc:call(CTNode, code, add_patha, [D]) || D <- PathDirs], test_server:format(Level, "Dirs added to code path (on ~w):~n", [CTNode]), @@ -1430,7 +1433,21 @@ rm_files([F | Fs]) -> end; rm_files([]) -> ok. - + +unique_timestamp() -> + unique_timestamp(os:timestamp(), 100000). + +unique_timestamp(TS, 0) -> + TS; +unique_timestamp(TS0, N) -> + case os:timestamp() of + TS0 -> + timer:sleep(1), + unique_timestamp(TS0, N-1); + TS1 -> + TS1 + end. + %%%----------------------------------------------------------------- %%% slave_stop(Node) -> |