aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2016-04-12 18:58:15 +0200
committerSverker Eriksson <[email protected]>2016-04-12 18:58:15 +0200
commit1579de1ff38471e70df20fcdd79c42c4a5a89a50 (patch)
tree1431a4bda8b2497b4f0fedc606de88118270ac64 /lib
parent0f8f4e96ff8479018e5e921775654adc15f5e771 (diff)
parent574ddd9b6ae22bbb8df3a5094f013615b88ad7c6 (diff)
downloadotp-1579de1ff38471e70df20fcdd79c42c4a5a89a50.tar.gz
otp-1579de1ff38471e70df20fcdd79c42c4a5a89a50.tar.bz2
otp-1579de1ff38471e70df20fcdd79c42c4a5a89a50.zip
Merge branch 'sverker/crypto/skip-link_test-without-ldd'
Diffstat (limited to 'lib')
-rw-r--r--lib/crypto/test/old_crypto_SUITE.erl4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/crypto/test/old_crypto_SUITE.erl b/lib/crypto/test/old_crypto_SUITE.erl
index 37cce2ebd2..61cdd0ad7e 100644
--- a/lib/crypto/test/old_crypto_SUITE.erl
+++ b/lib/crypto/test/old_crypto_SUITE.erl
@@ -187,7 +187,9 @@ ldd_program() ->
case os:find_executable("otool") of
false -> none;
Otool -> Otool ++ " -L"
- end
+ end;
+ _ ->
+ none
end;
Ldd when is_list(Ldd) -> Ldd
end.