diff options
| author | Björn Gustavsson <[email protected]> | 2013-09-27 10:14:38 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2013-09-27 10:14:38 +0200 |
| commit | 8f8c00f77779f5d47642e6decddf298d2f8e2254 (patch) | |
| tree | 45038211847c359b134c9ed2e4ec668fffb286f0 /lib/asn1/test/testInfObj.erl | |
| parent | 5e2f627736f95380fe1708055e5c6221d5a9bea9 (diff) | |
| parent | 5df3c4454fd5f302317bed7f5f83f20f7e5d9580 (diff) | |
| download | otp-8f8c00f77779f5d47642e6decddf298d2f8e2254.tar.gz otp-8f8c00f77779f5d47642e6decddf298d2f8e2254.tar.bz2 otp-8f8c00f77779f5d47642e6decddf298d2f8e2254.zip | |
Merge branch 'maint'
* maint: (24 commits)
No longer compile the X420 specs for plain BER
Combine the testSeqIndefinite/1 and testSetIndefinite/1 test cases
Remove asn1_wrapper
Eliminate the use of asn1_wrapper
Simplify tests of CHOICE with OPTIONAL
asn1_test_lib: Add roundtrip functions and use them everywhere
Makefile: Release Emakefile to ensure warnings are treated as errors
Don't allow unused exported functions in test case helpers
Move out specific tests from asn1_test_lib
testMegaco: Remove unused exported function msg11/0
ASN.1 tests: Don't export functions that are only locally called
Remove unused pem_performance.erl file
asn1_SUITE: Reinstate test of sub-constraint
ASN.1 tests: Remove unused choice_extension.erl
Remove unused compile() functions
asn1_test_lib: Remove unnecessary loading of a compiled ASN.1 spec
Slightly clean up testX420
asn1_SUITE: Combine most tests that use External.asn1
asn1ct_gen: Clean up process dictionary after generating
asn1ct_parser2: Clean the process dictionary after parsing
...
Diffstat (limited to 'lib/asn1/test/testInfObj.erl')
| -rw-r--r-- | lib/asn1/test/testInfObj.erl | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/asn1/test/testInfObj.erl b/lib/asn1/test/testInfObj.erl index 76f216fdad..cd335e1023 100644 --- a/lib/asn1/test/testInfObj.erl +++ b/lib/asn1/test/testInfObj.erl @@ -121,9 +121,7 @@ main(_Erule) -> {'Multiple-Optionals',1,asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE}). roundtrip(M, T, V) -> - {ok,Enc} = M:encode(T, V), - {ok,V} = M:decode(T, Enc), - ok. + asn1_test_lib:roundtrip(M, T, V). enc_dec(M, T, V0) -> {ok,Enc} = M:encode(T, V0), |