From 13d4a8d4e69a8965ab66685e751d11cda5f29567 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= <essen@ninenines.eu>
Date: Mon, 19 Nov 2012 19:02:21 +0100
Subject: Remove what remains of the Mnemosyne code

---
 lib/mnesia/test/mnesia.spec             |  3 ---
 lib/mnesia/test/mnesia_SUITE.erl        |  1 -
 lib/mnesia/test/mnesia_config_test.erl  | 42 +--------------------------------
 lib/mnesia/test/mnesia_measure_test.erl |  3 +--
 4 files changed, 2 insertions(+), 47 deletions(-)

(limited to 'lib/mnesia/test')

diff --git a/lib/mnesia/test/mnesia.spec b/lib/mnesia/test/mnesia.spec
index 204d1519cb..653e515317 100644
--- a/lib/mnesia/test/mnesia.spec
+++ b/lib/mnesia/test/mnesia.spec
@@ -42,9 +42,6 @@
 {skip_cases,"../mnesia_test",mnesia_measure_test,
             [measure_all_api_functions],
             "Not yet implemented"}.
-{skip_cases,"../mnesia_test",mnesia_measure_test,
-            [mnemosyne_vs_mnesia_kernel],
-            "Not yet implemented"}.
 {skip_cases,"../mnesia_test",mnesia_examples_test,
             [company],
             "Not yet implemented"}.
diff --git a/lib/mnesia/test/mnesia_SUITE.erl b/lib/mnesia/test/mnesia_SUITE.erl
index 2267a94164..5dbb80d4eb 100644
--- a/lib/mnesia/test/mnesia_SUITE.erl
+++ b/lib/mnesia/test/mnesia_SUITE.erl
@@ -105,7 +105,6 @@ groups() ->
      {otp_r4b, [],
       [{mnesia_config_test, access_module},
        {mnesia_config_test, dump_log_load_regulation},
-       {mnesia_config_test, embedded_mnemosyne},
        {mnesia_config_test, ignore_fallback_at_startup},
        {mnesia_config_test, max_wait_for_decision},
        {mnesia_consistency_test, consistency_after_restore},
diff --git a/lib/mnesia/test/mnesia_config_test.erl b/lib/mnesia/test/mnesia_config_test.erl
index 93510d539c..fd294780da 100644
--- a/lib/mnesia/test/mnesia_config_test.erl
+++ b/lib/mnesia/test/mnesia_config_test.erl
@@ -36,7 +36,6 @@
 	 dump_log_load_regulation/1,
 	
 	 dump_log_update_in_place/1,
-	 embedded_mnemosyne/1,
 	 event_module/1,
 	 ignore_fallback_at_startup/1,
 	 inconsistent_database/1,
@@ -104,7 +103,7 @@ end_per_testcase(Func, Conf) ->
 all() -> 
     [access_module, auto_repair, backup_module, debug, dir,
      dump_log_load_regulation, {group, dump_log_thresholds},
-     dump_log_update_in_place, embedded_mnemosyne,
+     dump_log_update_in_place,
      event_module, ignore_fallback_at_startup,
      inconsistent_database, max_wait_for_decision,
      send_compressed, app_test, {group, schema_config},
@@ -610,45 +609,6 @@ dump_log_load_regulation(Config) when is_list(Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-embedded_mnemosyne(doc) ->
-    ["Start Mnemosyne as an embedded part of Mnesia",
-     "on some of the nodes"];
-embedded_mnemosyne(suite) ->
-    [];
-embedded_mnemosyne(Config) when is_list(Config) ->
-    Nodes = ?acquire_nodes(1, Config),
-    Param = embedded_mnemosyne,
-
-    %% Normal 
-    NoMnem = false,
-    ?match(NoMnem, mnesia:system_info(Param)),
-    ?match(undefined, whereis(mnemosyne_catalog)),
-    ?match([], mnesia_test_lib:stop_mnesia(Nodes)),
-
-    %% Bad
-    Bad = arne_anka,
-    ?match({error, {bad_type, Param, Bad}},
-	   mnesia:start([{Param, Bad}])),
-
-    case code:priv_dir(mnemosyne) of
-	{error, _} -> %% No mnemosyne on later systems
-	    ok;
-	_ ->
-	    %% Mnemosyne as embedded application
-	    Mnem = true,
-	    ?match(undefined, whereis(mnemosyne_catalog)),
-	    ?match(ok,mnesia:start([{Param, Mnem}])),
-	    ?match(Mnem, mnesia:system_info(Param)),
-	    ?match(Pid when is_pid(Pid), whereis(mnemosyne_catalog)),
-	    ?match([], mnesia_test_lib:stop_mnesia(Nodes)),
-	    ?match(undefined, whereis(mnemosyne_catalog))
-    end,
-    ?verify_mnesia([], Nodes),
-    ?cleanup(1, Config),
-    ok.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
 ignore_fallback_at_startup(doc) ->
     ["Start Mnesia without rollback of the database to the fallback. ",
      "Once Mnesia has been (re)started the installed fallback should",
diff --git a/lib/mnesia/test/mnesia_measure_test.erl b/lib/mnesia/test/mnesia_measure_test.erl
index e63689d83a..dfed302814 100644
--- a/lib/mnesia/test/mnesia_measure_test.erl
+++ b/lib/mnesia/test/mnesia_measure_test.erl
@@ -72,8 +72,7 @@ groups() ->
        resource_consumption_at_full_load]},
      {benchmarks, [],
       [{group, meter}, cost, dbn_meters,
-       measure_all_api_functions, {group, tpcb},
-       mnemosyne_vs_mnesia_kernel]},
+       measure_all_api_functions, {group, tpcb}]},
      {tpcb, [], [ram_tpcb, disc_tpcb, disc_only_tpcb]},
      {meter, [], [ram_meter, disc_meter, disc_only_meter]}].
 
-- 
cgit v1.2.3