aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/test
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2018-03-02 10:18:34 +0100
committerLukas Larsson <[email protected]>2018-03-02 10:18:34 +0100
commit5d4267657b2ef41d33cfd6ed920186bcf215d520 (patch)
tree84471426bfb9a02060345fb72319a73f0a90bfec /lib/kernel/test
parent73fc86ea0c79f4b1fbc434ba4261345b6d6e772f (diff)
parentfb218aaf3ef9da8f21a95f7e5a96e0210812d04b (diff)
downloadotp-5d4267657b2ef41d33cfd6ed920186bcf215d520.tar.gz
otp-5d4267657b2ef41d33cfd6ed920186bcf215d520.tar.bz2
otp-5d4267657b2ef41d33cfd6ed920186bcf215d520.zip
Merge branch 'maint'
Diffstat (limited to 'lib/kernel/test')
-rw-r--r--lib/kernel/test/os_SUITE.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/kernel/test/os_SUITE.erl b/lib/kernel/test/os_SUITE.erl
index 4369b1b0f9..591fbb2125 100644
--- a/lib/kernel/test/os_SUITE.erl
+++ b/lib/kernel/test/os_SUITE.erl
@@ -334,8 +334,8 @@ max_size_command(_Config) ->
Res32768 = os:cmd("cat /dev/zero", #{ max_size => 32768 }),
32768 = length(Res32768),
- ResHello = os:cmd("echo hello", #{ max_size => 20 }),
- 6 = length(ResHello).
+ ResHello = string:trim(os:cmd("echo hello", #{ max_size => 20 })),
+ 5 = length(ResHello).
%% Test that the os:perf_counter api works as expected
perf_counter_api(_Config) ->