aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2012-09-05 13:16:40 +0200
committerSiri Hansen <[email protected]>2012-09-05 13:16:40 +0200
commit5d622b189c849e5dd818c355dd506ef574dec030 (patch)
tree99b3ae5852d970c7a559c1a17ce75db72fb570ab
parent94fa6d2fcf729d3df37a4e8dc4e369bf444ea55a (diff)
downloadotp-5d622b189c849e5dd818c355dd506ef574dec030.tar.gz
otp-5d622b189c849e5dd818c355dd506ef574dec030.tar.bz2
otp-5d622b189c849e5dd818c355dd506ef574dec030.zip
Extend watchdog, and add report_error option to compile:file in escript_SUITE
1. escript_SUITE:create_and_extract sometimes fails with timetrap timeout on solars. Watchdog is extended to avoid this. 2. escript_SUITE:archive_scritp sometimes fails with compilation error. Option 'report_errors' is added to compile:file in order to get more information.
-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 ->