diff options
| author | Rickard Green <[email protected]> | 2016-08-30 16:25:00 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-08-30 16:25:00 +0200 |
| commit | 925984e94f2c1933bb659dfb626c191982b7c8d4 (patch) | |
| tree | d1c5bec6861970d2c7e0d8090d39d8e77c2d4616 /erts/emulator/test/system_info_SUITE.erl | |
| parent | d419ca5917d4d27afe0518e5e5c444af5b11f480 (diff) | |
| parent | fc85e401ee279cc3b69635a71ffa93544ce5b99d (diff) | |
| download | otp-925984e94f2c1933bb659dfb626c191982b7c8d4.tar.gz otp-925984e94f2c1933bb659dfb626c191982b7c8d4.tar.bz2 otp-925984e94f2c1933bb659dfb626c191982b7c8d4.zip | |
Merge branch 'rickard/time-unit/OTP-13735' into maint
* rickard/time-unit/OTP-13735:
Update test-cases to use new symbolic time units
Replace misspelled symbolic time units
Conflicts:
erts/doc/src/erlang.xml
erts/emulator/test/long_timers_test.erl
Diffstat (limited to 'erts/emulator/test/system_info_SUITE.erl')
| -rw-r--r-- | erts/emulator/test/system_info_SUITE.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/test/system_info_SUITE.erl b/erts/emulator/test/system_info_SUITE.erl index f31d474c20..a4aedb31f6 100644 --- a/erts/emulator/test/system_info_SUITE.erl +++ b/erts/emulator/test/system_info_SUITE.erl @@ -508,7 +508,7 @@ start_node(Config, Envs) when is_list(Config) -> ++ "-" ++ atom_to_list(proplists:get_value(testcase, Config)) ++ "-" - ++ integer_to_list(erlang:system_time(seconds)) + ++ integer_to_list(erlang:system_time(second)) ++ "-" ++ integer_to_list(erlang:unique_integer([positive]))), test_server:start_node(Name, peer, [{args, "-pa "++Pa}, {env, Envs}]). |