aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2011-04-20 14:49:03 +0200
committerPeter Andersson <[email protected]>2011-04-28 22:46:50 +0200
commit2de8f6d4b2e572171cb3237ed7b9f5a1dfcc16e4 (patch)
tree09d8bf046ce1f495393276c3b03a9698d14d29a6
parent0197acace48c17dcb500b7bdb10d2cc1cbaa848e (diff)
downloadotp-2de8f6d4b2e572171cb3237ed7b9f5a1dfcc16e4.tar.gz
otp-2de8f6d4b2e572171cb3237ed7b9f5a1dfcc16e4.tar.bz2
otp-2de8f6d4b2e572171cb3237ed7b9f5a1dfcc16e4.zip
Fix problem with merging ticket branch.
-rw-r--r--lib/common_test/test/ct_error_SUITE.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/common_test/test/ct_error_SUITE.erl b/lib/common_test/test/ct_error_SUITE.erl
index 813467aabe..6867e59b60 100644
--- a/lib/common_test/test/ct_error_SUITE.erl
+++ b/lib/common_test/test/ct_error_SUITE.erl
@@ -221,7 +221,8 @@ timetrap_parallel(Config) when is_list(Config) ->
ct_test_support:log_events(timetrap_parallel,
reformat(Events, ?eh),
- ?config(priv_dir, Config)),
+ ?config(priv_dir, Config),
+ Opts),
TestEvents = events_to_check(timetrap_parallel),
ok = ct_test_support:verify_events(TestEvents, Events, Config).