aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorSiri Hansen <siri@erlang.org>2012-09-10 12:20:45 +0200
committerSiri Hansen <siri@erlang.org>2012-09-10 12:20:45 +0200
commitf60e85b22cb57ceecd0c82426c6c484102cf6bd2 (patch)
tree24469d18def6c910f64d926c4a54bb318b534a41 /lib
parent0d297680b28e6ac398f212cbccf1f0b704a5a921 (diff)
parent5d622b189c849e5dd818c355dd506ef574dec030 (diff)
downloadotp-f60e85b22cb57ceecd0c82426c6c484102cf6bd2.tar.gz
otp-f60e85b22cb57ceecd0c82426c6c484102cf6bd2.tar.bz2
otp-f60e85b22cb57ceecd0c82426c6c484102cf6bd2.zip
Merge branch 'siri/stdlib/escript_SUITE/OTP-10393'
* siri/stdlib/escript_SUITE/OTP-10393: Extend watchdog, and add report_error option to compile:file in escript_SUITE
Diffstat (limited to 'lib')
-rw-r--r--lib/stdlib/test/escript_SUITE.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/stdlib/test/escript_SUITE.erl b/lib/stdlib/test/escript_SUITE.erl
index 38c085616d..5b592c65cc 100644
--- a/lib/stdlib/test/escript_SUITE.erl
+++ b/lib/stdlib/test/escript_SUITE.erl
@@ -64,7 +64,7 @@ end_per_group(_GroupName, Config) ->
Config.
init_per_testcase(_Case, Config) ->
- ?line Dog = ?t:timetrap(?t:minutes(2)),
+ ?line Dog = ?t:timetrap(?t:minutes(5)),
[{watchdog,Dog}|Config].
end_per_testcase(_Case, Config) ->
@@ -618,7 +618,7 @@ compile_files([File | Files], SrcDir, OutDir) ->
case filename:extension(File) of
".erl" ->
AbsFile = filename:join([SrcDir, File]),
- case compile:file(AbsFile, [{outdir, OutDir}]) of
+ case compile:file(AbsFile, [{outdir, OutDir},report_errors]) of
{ok, _Mod} ->
compile_files(Files, SrcDir, OutDir);
Error ->