Add the other PKCS files to the rfcs test case

Changed the following from the original copies:

PKCS-5 (renamed from PKCS-v21)

PKCS-9 Import from CryptographicMessageSyntax-2009 instead
of CryptographicMessageSyntax

Since most of the files from the x420 directory are needed,
copy all of them into the rfcs directory and remove the
x420 directory and test case. Copy the test of OTP-7759 to
the testRfcs test case.

1 files changed, 9 insertions, 5 deletions

diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl
index 080e51d129..6d7ec7ba50 100644
--- a/lib/asn1/test/asn1_SUITE.erl
+++ b/lib/asn1/test/asn1_SUITE.erl
@@ -160,8 +160,7 @@ groups() ->
        testNortel,
        % Uses 'PKCS7', 'InformationFramework'
        {group, [], [test_WS_ParamClass,
-		    test_modified_x420,
-                    testX420]},
+		    test_modified_x420]},
        %% Don't run all these at the same time.
        {group, [],
 	[testTcapsystem,
@@ -202,7 +201,7 @@ init_per_testcase(Func, Config) ->
     true = code:add_patha(CaseDir),
 
     Dog = case Func of
-              testX420 -> ct:timetrap({minutes, 90});
+              testRfcs -> ct:timetrap({minutes, 90});
               _        -> ct:timetrap({minutes, 60})
           end,
     [{case_dir, CaseDir}, {watchdog, Dog}|Config].
@@ -1012,8 +1011,13 @@ testS1AP(Config, Rule, Opts) ->
 
 testRfcs(Config) ->  test(Config, fun testRfcs/3, [{ber,[der]}]).
 testRfcs(Config, Rule, Opts) ->
-    testRfcs:compile(Config, Rule, Opts),
-    testRfcs:test().
+    case erlang:system_info(system_architecture) of
+	"sparc-sun-solaris2.10" ->
+	    {skip,"Too slow for an old Sparc"};
+	_ ->
+	    testRfcs:compile(Config, Rule, Opts),
+	    testRfcs:test()
+    end.
 
 test_compile_options(Config) ->
     ok = test_compile_options:wrong_path(Config),