diff options
| author | Lukas Larsson <[email protected]> | 2012-06-01 10:53:11 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2012-06-01 10:53:11 +0200 |
| commit | b82c337dfce2d5bc1e435ebaa6060cb982bc5ad6 (patch) | |
| tree | 8407030ca1c7b7649a21030c36275193d066e36c /lib/stdlib | |
| parent | 3e348c69b6921dd0e2c5b699ccd36d46321c953c (diff) | |
| parent | 50da1658240587622a057afe2db13d7ebcea3813 (diff) | |
| download | otp-b82c337dfce2d5bc1e435ebaa6060cb982bc5ad6.tar.gz otp-b82c337dfce2d5bc1e435ebaa6060cb982bc5ad6.tar.bz2 otp-b82c337dfce2d5bc1e435ebaa6060cb982bc5ad6.zip | |
Merge branch 'lukas/test-cases' into maint
* lukas/test-cases:
Ignore calls to wx* modules if it is undefined
Fix erl_interface testcases
Update gccifier to respect -link option
Extand timetrap for escript tests
Fix compilation issues on windows and Ubuntu 12.04
Ignore common_test bootstrap
Diffstat (limited to 'lib/stdlib')
| -rw-r--r-- | lib/stdlib/test/escript_SUITE.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/stdlib/test/escript_SUITE.erl b/lib/stdlib/test/escript_SUITE.erl index 9f95df062b..7ed1ee742a 100644 --- a/lib/stdlib/test/escript_SUITE.erl +++ b/lib/stdlib/test/escript_SUITE.erl @@ -62,7 +62,7 @@ end_per_group(_GroupName, Config) -> Config. init_per_testcase(_Case, Config) -> - ?line Dog = ?t:timetrap(?t:minutes(1)), + ?line Dog = ?t:timetrap(?t:minutes(2)), [{watchdog,Dog}|Config]. end_per_testcase(_Case, Config) -> |