diff options
| author | Lukas Larsson <[email protected]> | 2017-09-12 10:00:47 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2017-09-12 10:00:47 +0200 |
| commit | 18fb1a9230578456f3d03b4136ed296407bdf53c (patch) | |
| tree | 4edfa1ba190f4ebbf3066cd394d9439bb7a62486 /lib/asn1/test/testUniqueObjectSets.erl | |
| parent | 54d87b64ba447371fb51f1ad7e773317e684843f (diff) | |
| parent | bcfa4564df41ad5806a4848dcb3be31fbfea6a9e (diff) | |
| download | otp-18fb1a9230578456f3d03b4136ed296407bdf53c.tar.gz otp-18fb1a9230578456f3d03b4136ed296407bdf53c.tar.bz2 otp-18fb1a9230578456f3d03b4136ed296407bdf53c.zip | |
Merge branch 'lukas/ct/ts_abort_on_compilation_fail' into maint
* lukas/ct/ts_abort_on_compilation_fail:
erts: Fix leaking of fds in iovec_SUITE
ts: Don't test apps that are not available
asn1: Fix test suite deprecated functions
ct: ts:run now abort the test run on compilation failure
Diffstat (limited to 'lib/asn1/test/testUniqueObjectSets.erl')
| -rw-r--r-- | lib/asn1/test/testUniqueObjectSets.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/asn1/test/testUniqueObjectSets.erl b/lib/asn1/test/testUniqueObjectSets.erl index 476d190651..cabdb44a0c 100644 --- a/lib/asn1/test/testUniqueObjectSets.erl +++ b/lib/asn1/test/testUniqueObjectSets.erl @@ -60,7 +60,7 @@ main(CaseDir, Rule, Opts) -> Objs = [gen_obj(I) || {I,_,_} <- D1], DupObjs = [gen_dup_obj(I, T) || {I,T,_} <- D1], DupObjRefs0 = [gen_dup_obj_refs(I) || {I,_,_} <- D1], - DupObjRefs = string:join(DupObjRefs0, " |\n"), + DupObjRefs = lists:join(" |\n", DupObjRefs0), Asn1Spec = 'UniqueObjectSets', A = ["UniqueObjectSets DEFINITIONS AUTOMATIC TAGS ::=\n", "BEGIN\n\n", |