diff options
| author | Sverker Eriksson <[email protected]> | 2017-02-20 20:06:28 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2017-02-20 20:06:28 +0100 |
| commit | 82d3513f95198b0a4295ba866a78ae6c137a34d5 (patch) | |
| tree | b45aee60996f1054e15308defddc8e96e8ef91b8 /lib/stdlib/test/shell_SUITE.erl | |
| parent | 5adbf961a3c79a6782f8be8336ec26594754e9e8 (diff) | |
| parent | 32a74e6c83cd110b8e8ab714be4365c0da558fca (diff) | |
| download | otp-82d3513f95198b0a4295ba866a78ae6c137a34d5.tar.gz otp-82d3513f95198b0a4295ba866a78ae6c137a34d5.tar.bz2 otp-82d3513f95198b0a4295ba866a78ae6c137a34d5.zip | |
Merge branch 'master' into sverker/enif_select
Conflicts:
erts/emulator/beam/erl_binary.h
erts/emulator/beam/erl_monitors.c
erts/emulator/beam/erl_nif.c
erts/emulator/beam/global.h
erts/emulator/test/nif_SUITE_data/nif_SUITE.c
Diffstat (limited to 'lib/stdlib/test/shell_SUITE.erl')
| -rw-r--r-- | lib/stdlib/test/shell_SUITE.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/stdlib/test/shell_SUITE.erl b/lib/stdlib/test/shell_SUITE.erl index 15ccdea284..4864bc3d72 100644 --- a/lib/stdlib/test/shell_SUITE.erl +++ b/lib/stdlib/test/shell_SUITE.erl @@ -282,7 +282,7 @@ restricted_local(Config) when is_list(Config) -> comm_err(<<"begin F=fun() -> hello end, foo(F) end.">>), "exception error: undefined shell command banan/1" = comm_err(<<"begin F=fun() -> hello end, banan(F) end.">>), - "{error,"++_ = t(<<"begin F=fun() -> hello end, c(F) end.">>), + "Recompiling "++_ = t(<<"c(shell_SUITE).">>), "exception exit: restricted shell does not allow l(" ++ _ = comm_err(<<"begin F=fun() -> hello end, l(F) end.">>), "exception error: variable 'F' is unbound" = |