aboutsummaryrefslogtreecommitdiffstats
path: root/lib/asn1
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2013-09-05 10:11:39 +0200
committerBjörn Gustavsson <[email protected]>2013-09-18 10:22:30 +0200
commit4051b16a2b2bf734c05ec8115b7871cb06b4d911 (patch)
tree00a11262d4646b2fd3fd5ad999d9db2c80a74617 /lib/asn1
parentcc69e8e6c145c0829f184e9ac402b2ec8172a005 (diff)
downloadotp-4051b16a2b2bf734c05ec8115b7871cb06b4d911.tar.gz
otp-4051b16a2b2bf734c05ec8115b7871cb06b4d911.tar.bz2
otp-4051b16a2b2bf734c05ec8115b7871cb06b4d911.zip
asn1_SUITE: Combine most tests that use External.asn1
By combining most tests that use External.asn, we will only need to compile that spec once instead of 11 times. While combining the test cases, make sure to remove the redundant code in testPrimExternal/1 that tests primitive strings in exactly the same way as testPrimString/1. Removing the redundant code shaves off a few seconds of testing time. Keep testSeqExtension/1 as a separate test case, since it is a complicated test case that does hairy stuff to the source files.
Diffstat (limited to 'lib/asn1')
-rw-r--r--lib/asn1/test/asn1_SUITE.erl101
1 files changed, 28 insertions, 73 deletions
diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl
index ebe819149c..cb000713cf 100644
--- a/lib/asn1/test/asn1_SUITE.erl
+++ b/lib/asn1/test/asn1_SUITE.erl
@@ -100,18 +100,8 @@ groups() ->
testOpt,
testSeqDefault,
% Uses 'External'
- {group, [], [testChoExternal,
- testPrimExternal,
- testSeqExtension,
- testSeqExternal,
- testSeqOfExternal,
- testSeqOfTag,
- testSeqTag,
- testSetExtension,
- testSetExternal,
- testSetOfExternal,
- testSetOfTag,
- testSetTag]},
+ {group, [], [testExternal,
+ testSeqExtension]},
testSeqOptional,
testSeqPrim,
testSeqTypeRefCho,
@@ -353,15 +343,33 @@ testPrimStrings_cases(Rule) ->
testPrimStrings:utf8_string(Rule),
testPrimStrings:fragmented(Rule).
-testPrimExternal(Config) -> test(Config, fun testPrimExternal/3).
-testPrimExternal(Config, Rule, Opts) ->
- asn1_test_lib:compile_all(["External", "PrimExternal"], Config,
- [Rule|Opts]),
+testExternal(Config) -> test(Config, fun testExternal/3).
+testExternal(Config, Rule, Opts) ->
+ asn1_test_lib:compile_all(["External",
+ "ChoExternal",
+ "PrimExternal",
+ "SeqExternal",
+ "SeqOfExternal",
+ "SeqOfTag",
+ "SeqTag",
+ "SetExtension",
+ "SetExternal",
+ "SetOfExternal",
+ "SetOfTag",
+ "SetTag"],
+ Config, [Rule|Opts]),
+ testChoExternal:external(Rule),
testPrimExternal:external(Rule),
- asn1_test_lib:compile_all(["PrimStrings", "BitStr"], Config,
- [Rule|Opts]),
- testPrimStrings_cases(Rule),
- testPrimStrings:more_strings(Rule).
+ testSeqExternal:main(Rule),
+ testSeqOfExternal:main(Rule),
+ testSeqOfTag:main(Rule),
+ testSeqTag:main(Rule),
+ testSetExtension:main(Rule),
+ testSetExternal:main(Rule),
+ testSetOfExternal:main(Rule),
+ testSetOfTag:main(Rule),
+ testSetTag:main(Rule).
+
testChoPrim(Config) -> test(Config, fun testChoPrim/3).
testChoPrim(Config, Rule, Opts) ->
@@ -374,11 +382,6 @@ testChoExtension(Config, Rule, Opts) ->
asn1_test_lib:compile("ChoExtension", Config, [Rule|Opts]),
testChoExtension:extension(Rule).
-testChoExternal(Config) -> test(Config, fun testChoExternal/3).
-testChoExternal(Config, Rule, Opts) ->
- asn1_test_lib:compile_all(["External", "ChoExternal"], Config, [Rule|Opts]),
- testChoExternal:external(Rule).
-
testChoOptional(Config) -> test(Config, fun testChoOptional/3).
testChoOptional(Config, Rule, Opts) ->
asn1_test_lib:compile("ChoOptional", Config, [Rule|Opts]),
@@ -453,11 +456,6 @@ testSeqExtension(Config, Rule, Opts) ->
DataDir = ?config(data_dir, Config),
testSeqExtension:main(Rule, DataDir, [Rule|Opts]).
-testSeqExternal(Config) -> test(Config, fun testSeqExternal/3).
-testSeqExternal(Config, Rule, Opts) ->
- asn1_test_lib:compile_all(["External", "SeqExternal"], Config, [Rule|Opts]),
- testSeqExternal:main(Rule).
-
testSeqOptional(Config) -> test(Config, fun testSeqOptional/3).
testSeqOptional(Config, Rule, Opts) ->
asn1_test_lib:compile("SeqOptional", Config, [Rule|Opts]),
@@ -474,11 +472,6 @@ testSeq2738(Config, Rule, Opts) ->
asn1_test_lib:compile("Seq2738", Config, [Rule|Opts]),
testSeq2738:main(Rule).
-testSeqTag(Config) -> test(Config, fun testSeqTag/3).
-testSeqTag(Config, Rule, Opts) ->
- asn1_test_lib:compile_all(["External", "SeqTag"], Config, [Rule|Opts]),
- testSeqTag:main(Rule).
-
testSeqTypeRefCho(Config) -> test(Config, fun testSeqTypeRefCho/3).
testSeqTypeRefCho(Config, Rule, Opts) ->
asn1_test_lib:compile("SeqTypeRefCho", Config, [Rule|Opts]),
@@ -519,17 +512,6 @@ testSeqOfIndefinite(Config, Rule, Opts) ->
asn1_test_lib:compile_all(Files, Config, [Rule|Opts]),
testSeqOfIndefinite:main().
-testSeqOfExternal(Config) -> test(Config, fun testSeqOfExternal/3).
-testSeqOfExternal(Config, Rule, Opts) ->
- asn1_test_lib:compile_all(["External", "SeqOfExternal"], Config,
- [Rule|Opts]),
- testSeqOfExternal:main(Rule).
-
-testSeqOfTag(Config) -> test(Config, fun testSeqOfTag/3).
-testSeqOfTag(Config, Rule, Opts) ->
- asn1_test_lib:compile_all(["External", "SeqOfTag"], Config, [Rule|Opts]),
- testSeqOfTag:main(Rule).
-
testSetDefault(Config) -> test(Config, fun testSetDefault/3).
testSetDefault(Config, Rule, Opts) ->
asn1_test_lib:compile("SetDefault", Config, [Rule|Opts]),
@@ -540,17 +522,6 @@ testParamBasic(Config, Rule, Opts) ->
asn1_test_lib:compile("ParamBasic", Config, [Rule|Opts]),
testParamBasic:main(Rule).
-testSetExtension(Config) -> test(Config, fun testSetExtension/3).
-testSetExtension(Config, Rule, Opts) ->
- asn1_test_lib:compile_all(["External", "SetExtension"], Config,
- [Rule|Opts]),
- testSetExtension:main(Rule).
-
-testSetExternal(Config) -> test(Config, fun testSetExternal/3).
-testSetExternal(Config, Rule, Opts) ->
- asn1_test_lib:compile_all(["External", "SetExternal"], Config, [Rule|Opts]),
- testSetExternal:main(Rule).
-
testSetOptional(Config) -> test(Config, fun testSetOptional/3).
testSetOptional(Config, Rule, Opts) ->
asn1_test_lib:compile("SetOptional", Config, [Rule|Opts]),
@@ -562,11 +533,6 @@ testSetPrim(Config, Rule, Opts) ->
asn1_test_lib:compile("SetPrim", Config, [Rule|Opts]),
testSetPrim:main(Rule).
-testSetTag(Config) -> test(Config, fun testSetTag/3).
-testSetTag(Config, Rule, Opts) ->
- asn1_test_lib:compile_all(["External", "SetTag"], Config, [Rule|Opts]),
- testSetTag:main(Rule).
-
testSetTypeRefCho(Config) -> test(Config, fun testSetTypeRefCho/3).
testSetTypeRefCho(Config, Rule, Opts) ->
asn1_test_lib:compile("SetTypeRefCho", Config, [Rule|Opts]),
@@ -597,17 +563,6 @@ testSetOfCho(Config, Rule, Opts) ->
asn1_test_lib:compile("SetOfCho", Config, [Rule|Opts]),
testSetOfCho:main(Rule).
-testSetOfExternal(Config) -> test(Config, fun testSetOfExternal/3).
-testSetOfExternal(Config, Rule, Opts) ->
- asn1_test_lib:compile_all(["External", "SetOfExternal"], Config,
- [Rule|Opts]),
- testSetOfExternal:main(Rule).
-
-testSetOfTag(Config) -> test(Config, fun testSetOfTag/3).
-testSetOfTag(Config, Rule, Opts) ->
- asn1_test_lib:compile_all(["External", "SetOfTag"], Config, [Rule|Opts]),
- testSetOfTag:main(Rule).
-
c_syntax(Config) ->
DataDir = ?config(data_dir, Config),
[{error, _} = asn1ct:compile(filename:join(DataDir, F))