aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2011-11-28 14:38:19 +0100
committerBjörn Gustavsson <[email protected]>2011-11-28 14:38:19 +0100
commitdb76ac1fad6b44130103179944e934c13a365e5f (patch)
tree98fa76e7bf1dcd20bbdd64629ba7b3453fba98b5 /erts
parent3f499acce4fcfa3d93ca4c1ea6e9b86aef44d74a (diff)
parent803f8ebacd1665fcd7f0f826a5f537bdfd9e350f (diff)
downloadotp-db76ac1fad6b44130103179944e934c13a365e5f.tar.gz
otp-db76ac1fad6b44130103179944e934c13a365e5f.tar.bz2
otp-db76ac1fad6b44130103179944e934c13a365e5f.zip
Merge branch 'bjorn/fix-failing-tests'
* bjorn/fix-failing-tests: erlc_SUITE:arg_overflow/1: Lower number of options for MacOS X Lion tar_SUITE: Don't do symlink tests on Windows erlc_SUITE: Fix failing compile_mib/1 test case
Diffstat (limited to 'erts')
-rw-r--r--erts/test/erlc_SUITE.erl9
1 files changed, 8 insertions, 1 deletions
diff --git a/erts/test/erlc_SUITE.erl b/erts/test/erlc_SUITE.erl
index a9e28672e3..6c0d662126 100644
--- a/erts/test/erlc_SUITE.erl
+++ b/erts/test/erlc_SUITE.erl
@@ -154,7 +154,8 @@ compile_mib(Config) when is_list(Config) ->
?line BadFile = filename:join(SrcDir, "BAD-MIB.mib"),
?line run(Config, Cmd, BadFile, "",
- ["Error: syntax error before: mibs\$", "compilation_failed_ERROR_"]),
+ ["BAD-MIB.mib: 1: syntax error before: mibs\$",
+ "compilation_failed_ERROR_"]),
%% Make sure that no -I option works.
@@ -237,6 +238,12 @@ num_d_options() ->
%% of arguments is 16383.
%% See: http://www.in-ulm.de/~mascheck/various/argmax/
5440;
+ {{unix,darwin},{Major,_,_}} when Major >= 11 ->
+ %% "getconf ARG_MAX" still reports 262144 (as in previous
+ %% version of MacOS X), but the useful space seem to have
+ %% shrunk significantly (or possibly the number of arguments).
+ %% 7673
+ 7500;
{_,_} ->
12000
end.