diff options
author | Sverker Eriksson <[email protected]> | 2012-08-23 18:50:05 +0200 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2012-08-23 18:50:05 +0200 |
commit | 357bb3aabc58d4259fd4300e3345592ff39f3930 (patch) | |
tree | bee8fbc0e7a261eb5e1ff370ac600d24f1720809 /lib/kernel/test/code_SUITE.erl | |
parent | 2bfa27797be02ceb2af022f88f24619954bbbed6 (diff) | |
parent | 9a9dee8bf12212830be738932c4cdb45f2db2260 (diff) | |
download | otp-357bb3aabc58d4259fd4300e3345592ff39f3930.tar.gz otp-357bb3aabc58d4259fd4300e3345592ff39f3930.tar.bz2 otp-357bb3aabc58d4259fd4300e3345592ff39f3930.zip |
Merge branch 'maint'
Conflicts:
erts/preloaded/ebin/init.beam
Diffstat (limited to 'lib/kernel/test/code_SUITE.erl')
-rw-r--r-- | lib/kernel/test/code_SUITE.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/kernel/test/code_SUITE.erl b/lib/kernel/test/code_SUITE.erl index 69197d4915..5e0300639e 100644 --- a/lib/kernel/test/code_SUITE.erl +++ b/lib/kernel/test/code_SUITE.erl @@ -1589,7 +1589,8 @@ native_early_modules_1(Architecture) -> true -> ?line true = lists:all(fun code:is_module_native/1, [ets,file,filename,gb_sets,gb_trees, - hipe_unified_loader,lists,os,packages]), + %%hipe_unified_loader, no_native as workaround + lists,os,packages]), ok end. |