1 files changed, 28 insertions, 33 deletions

diff --git a/lib/asn1/test/asn1_SUITE.erl.src b/lib/asn1/test/asn1_SUITE.erl.src
index 7201365ea3..582ccd877c 100644
--- a/lib/asn1/test/asn1_SUITE.erl.src
+++ b/lib/asn1/test/asn1_SUITE.erl.src
@@ -60,10 +60,10 @@ bool0, bool1 = asn1_DEFAULT, bool2 = asn1_DEFAULT, bool3 = asn1_DEFAULT}).
 %-record('Def3',{
 %bool30 = asn1_DEFAULT, bool31 = asn1_DEFAULT, bool32 = asn1_DEFAULT, bool33 = asn1_DEFAULT}).
 
+suite() -> [{ct_hooks,[ts_install_cth]}].
 
-
-all(suite) -> [compile,parse,default_per,default_ber,default_per_opt,per,
-	       ber,testPrim, 
+all() -> [{group,compile},parse,default_per,default_ber,default_per_opt,per,
+	       {group,ber},testPrim, 
 	       testPrimStrings, testPrimExternal, testChoPrim, 
 	       testChoExtension, testChoExternal, testChoOptional, 
 	       testChoOptionalImplicitTag, testChoRecursive, 
@@ -99,21 +99,34 @@ all(suite) -> [compile,parse,default_per,default_ber,default_per_opt,per,
 	       testX420, test_x691,ticket_6143, testExtensionAdditionGroup
                ] ++ common() ++ particular().
 
-%all(suite) -> [test_inline,testNBAPsystem,test_compile_options,ticket_6143].
+groups() -> 
+    [
+     {compile, [],
+      [c_syntax, c_string_per, c_string_ber,
+       c_implicit_before_choice]},
+     {ber, [],
+      [ber_choiceinseq, ber_optional, ber_optional_keyed_list,
+       ber_other]},
+     {app_test, [], [{asn1_app_test, all}]},
+     {appup_test, [], [{asn1_appup_test, all}]}
+    ].
+
+init_per_suite(Config) ->
+    io:format("code:lib_dir(asn1) = ~p~n",[code:lib_dir(asn1)]),
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
 
-option_tests(suite) ->
-    [test_compile_options,ticket_6143].
+init_per_group(_GroupName, Config) ->
+	Config.
 
-infobj(suite) ->
-    [testInfObjectClass, testParameterizedInfObj, testMergeCompile, 
-     testobj, testDeepTConstr].
+end_per_group(_GroupName, Config) ->
+	Config.
 
-performance(suite) ->
-    [testTimer_ber, testTimer_ber_opt_driver, 
-     testTimer_per, testTimer_per_opt, testTimer_uper_bin].
 
-bugs(suite) ->
-   [test_ParamTypeInfObj, test_WS_ParamClass,test_Defed_ObjectIdentifier].
+%all(suite) -> [test_inline,testNBAPsystem,test_compile_options,ticket_6143].
+
 
 init_per_testcase(Func,Config) ->
     %%?line test_server:format("Func: ~p~n",[Func]),
@@ -129,7 +142,7 @@ init_per_testcase(Func,Config) ->
 %%    Dog=test_server:timetrap(1800000), % 30 minutes
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Func,Config) ->
+end_per_testcase(_Func,Config) ->
           Dog=?config(watchdog, Config),
           test_server:timetrap_cancel(Dog).
 
@@ -1371,22 +1384,6 @@ testSetOfTag_cases(Rules) ->
 
 sequence(suite) -> [{sequence,all}].
 
-compile(suite) -> [c_syntax,c_string_per,c_string_ber,c_implicit_before_choice];
-compile(Config) ->
-    ?line DataDir = ?config(data_dir,Config),
-    ?line TempDir = ?config(priv_dir,Config),
-    ?line True = lists:member(TempDir,code:get_path()),
-    ?line test_server:format("~p~n",[True]),
-    ?line test_server:format("~p~n",[code:get_path()]),
-    ?line true = code:add_patha(?config(priv_dir,Config)),
-    ?line {error,_R1} = asn1ct:compile(filename:join(DataDir,"Syntax")),
-    ?line ok = asn1ct:compile(filename:join(DataDir,"String"),[?PER,{outdir,TempDir}]),
-    test_server:format("first String ok~n"),
-    ?line ok = asn1ct:compile(filename:join(DataDir,"String"),[?BER,{outdir,TempDir}]),
-    ?line {error,_R2} = asn1ct:compile(filename:join(DataDir,"CCSNARG3"),[?BER,{outdir,TempDir}]),
-    ?line {error,_} = asn1ct:compile(filename:join(DataDir,"ImportsFrom"),[?BER,{outdir,TempDir}]),
-    ok.
-
 c_syntax(suite) -> [];
 c_syntax(Config) ->
     ?line DataDir%    ?line testExternal:compile(Config,?PER),     
@@ -1490,8 +1487,6 @@ per1_opt([M|T],DataDir,OutDir) ->
 per1_opt([],_,_) ->
     ok.
 
-ber(suite) -> [ber_choiceinseq,ber_optional,ber_optional_keyed_list,ber_other].
-
 ber_choiceinseq(suite) ->[];
 ber_choiceinseq(Config) ->
     ?line DataDir = ?config(data_dir,Config),