Merge branch 'bjorn/cuddle-with-tests'

* bjorn/cuddle-with-tests:
  inet_SUITE: Handle pointtopoint devices in getifaddrs/1
  file_SUITE: Increase timetrap for large_write/1
  gen_fsm_SUITE: Make abnormal1/1 stop failing
  gen_fsm_SUITE: Use timer:sleep/1 instead of ct:sleep/1
  inet_SUITE: Handle {error,enoent} in simple_netns_open
  inet_SUITE: Handle missing SCTP support in simple_netns/1
  asn1_SUITE: Remove temporary files
  file_name_SUITE: Improve handling of missing permission for link creation
  file_name_SUITE: Remove useless put/2 to process dictionary
  file_name_SUITE: Handle the case that HOMEPATH may not be set
  code_SUITE: Skip on_load_embedded/1 if no symlinks
  gen_sctp_SUITE: Skip most SCTP test cases on Solaris before 5.12
  heart_SUITE: Increase timeout in restart/1
  heart_SUITE: Use unique node names
  init_SUITE: Quote pathname that may contain a space
  gen_tcp_misc_SUITE: Clean up send_timeout{_active}/1
  Clean up the determination of the hostname

1 files changed, 3 insertions, 0 deletions

diff --git a/lib/kernel/test/code_SUITE.erl b/lib/kernel/test/code_SUITE.erl
index abea23e854..1b7672d362 100644
--- a/lib/kernel/test/code_SUITE.erl
+++ b/lib/kernel/test/code_SUITE.erl
@@ -1221,6 +1221,9 @@ on_load_embedded_1(Config) ->
     case file:make_symlink(OnLoadApp, LinkName) of
 	{error,enotsup} ->
 	    throw({skip,"Support for symlinks required"});
+	{error,eperm} ->
+	    %% On Windows, we may not have permissions to create symlinks.
+	    throw({skip,"Support for symlinks required"});
 	ok -> ok
     end,