diff options
| author | Erlang/OTP <[email protected]> | 2010-02-01 06:50:35 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-02-01 07:55:17 +0100 |
| commit | 710c91fc42a4dbf57ccfccd315d5febdc12cd99c (patch) | |
| tree | dcf340fe3c18d3a2f1ea20a343fd438570caeb03 /lib/stdlib | |
| parent | ed2c7a2d7702815ded8fe01c2e37291185137881 (diff) | |
| parent | 9e2ac0d0bd27a8bf2c309d038b95e7925dbf67aa (diff) | |
| download | otp-710c91fc42a4dbf57ccfccd315d5febdc12cd99c.tar.gz otp-710c91fc42a4dbf57ccfccd315d5febdc12cd99c.tar.bz2 otp-710c91fc42a4dbf57ccfccd315d5febdc12cd99c.zip | |
Merge branch 'bg/hipe-fixes' into ccase/r13b04_dev
* bg/hipe-fixes:
compiler: make ignore_native_errors also handle internal hipe errors
re tests: disable native-code compilation for huge modules
Teach the compiler the no_native option
Diffstat (limited to 'lib/stdlib')
| -rw-r--r-- | lib/stdlib/test/re_testoutput1_replacement_test.erl | 1 | ||||
| -rw-r--r-- | lib/stdlib/test/re_testoutput1_split_test.erl | 1 | ||||
| -rw-r--r-- | lib/stdlib/test/run_pcre_tests.erl | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/lib/stdlib/test/re_testoutput1_replacement_test.erl b/lib/stdlib/test/re_testoutput1_replacement_test.erl index fcd57f8f24..69cb140e0d 100644 --- a/lib/stdlib/test/re_testoutput1_replacement_test.erl +++ b/lib/stdlib/test/re_testoutput1_replacement_test.erl @@ -18,6 +18,7 @@ %% -module(re_testoutput1_replacement_test). -compile(export_all). +-compile(no_native). -include("test_server.hrl"). %% This file is generated by running run_pcre_tests:gen_repl_test("re_SUITE_data/testoutput1") run() -> diff --git a/lib/stdlib/test/re_testoutput1_split_test.erl b/lib/stdlib/test/re_testoutput1_split_test.erl index 294cfc33c4..e86a04b008 100644 --- a/lib/stdlib/test/re_testoutput1_split_test.erl +++ b/lib/stdlib/test/re_testoutput1_split_test.erl @@ -18,6 +18,7 @@ %% -module(re_testoutput1_split_test). -compile(export_all). +-compile(no_native). -include("test_server.hrl"). %% This file is generated by running run_pcre_tests:gen_split_test("re_SUITE_data/testoutput1") join([]) -> []; diff --git a/lib/stdlib/test/run_pcre_tests.erl b/lib/stdlib/test/run_pcre_tests.erl index 8c6424e708..78b4803fc8 100644 --- a/lib/stdlib/test/run_pcre_tests.erl +++ b/lib/stdlib/test/run_pcre_tests.erl @@ -987,6 +987,7 @@ gen_split_test(OneFile) -> {ok,F}= file:open(ErlFileName,[write]), io:format(F,"-module(~s).~n",[ErlModule]), io:format(F,"-compile(export_all).~n",[]), + io:format(F,"-compile(no_native).~n",[]), io:format(F,"-include(\"test_server.hrl\").~n",[]), %io:format(F,"-define(line,erlang:display(?LINE),).~n",[]), io:format(F,"%% This file is generated by running ~w:gen_split_test(~p)~n", @@ -1068,6 +1069,7 @@ gen_repl_test(OneFile) -> {ok,F}= file:open(ErlFileName,[write]), io:format(F,"-module(~s).~n",[ErlModule]), io:format(F,"-compile(export_all).~n",[]), + io:format(F,"-compile(no_native).~n",[]), io:format(F,"-include(\"test_server.hrl\").~n",[]), io:format(F,"%% This file is generated by running ~w:gen_repl_test(~p)~n", [?MODULE,OneFile]), |