diff options
| author | Patrik Nyblom <[email protected]> | 2012-03-21 11:01:54 +0100 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2012-03-21 11:01:54 +0100 |
| commit | 63b7b9fe381843755a112e69d75205cf14d75baf (patch) | |
| tree | 06f90f54cd491b052bf09e207f999bc3cbad8bd7 /lib/stdlib | |
| parent | 66b09026bfbb1385e17d4cd60c543858e5b5b98e (diff) | |
| parent | f65b43b80884ec86db328bdcc06109536116e211 (diff) | |
| download | otp-63b7b9fe381843755a112e69d75205cf14d75baf.tar.gz otp-63b7b9fe381843755a112e69d75205cf14d75baf.tar.bz2 otp-63b7b9fe381843755a112e69d75205cf14d75baf.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/stdlib')
| -rw-r--r-- | lib/stdlib/test/edlin_expand_SUITE.erl | 8 | ||||
| -rw-r--r-- | lib/stdlib/test/io_proto_SUITE.erl | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/stdlib/test/edlin_expand_SUITE.erl b/lib/stdlib/test/edlin_expand_SUITE.erl index a0e198ce09..f8d4fb4b6a 100644 --- a/lib/stdlib/test/edlin_expand_SUITE.erl +++ b/lib/stdlib/test/edlin_expand_SUITE.erl @@ -46,10 +46,10 @@ groups() -> []. init_per_suite(Config) -> - true = code:delete(expand_test), - true = code:delete(expand_test1), - true = code:delete('ExpandTestCaps'), - true = code:delete('ExpandTestCaps1'), + (catch code:delete(expand_test)), + (catch code:delete(expand_test1)), + (catch code:delete('ExpandTestCaps')), + (catch code:delete('ExpandTestCaps1')), Config. end_per_suite(_Config) -> diff --git a/lib/stdlib/test/io_proto_SUITE.erl b/lib/stdlib/test/io_proto_SUITE.erl index b69cd74edb..0b74d04b85 100644 --- a/lib/stdlib/test/io_proto_SUITE.erl +++ b/lib/stdlib/test/io_proto_SUITE.erl @@ -50,7 +50,7 @@ -define(privdir(Conf), ?config(priv_dir, Conf)). -endif. --define(debug, true). +%%-define(debug, true). -ifdef(debug). -define(format(S, A), io:format(S, A)). |