Changeset 90

Timestamp:

08/07/09 08:54:58 (3 years ago)

Author:

dom

Message:

Removed all bootstrapping code and the directory_tester is now run during install to test itself. Removed obsolete files.

Location:

trunk

Files:

• elisp (deleted)
• install (modified) (1 diff)
• src/adlib.erl (modified) (1 diff)
• src/agency.erl (deleted)
• src/compiler.erl (modified) (1 diff)
• src/directory_tester.erl (modified) (1 diff)
• src/extremeforge.erl (deleted)
• src/extremeforge_server.erl (deleted)
• src/sentinel.erl (deleted)
• src/shells.erl (modified) (1 diff)
• src/shells_tests.erl (deleted)
• src/tester.erl (modified) (1 diff)
• src/tester_test.erl (modified) (1 diff)
• src/tests_test.erl (modified) (1 diff)

trunk/install

@@ -3 +3 @@
 
 hostname=`hostname -s`
-erl -kernel error_logger "{file,\"tester.log\"}" -sname forgetester -noinput &
+
 cd ebin
-erlc ../src/shells.erl
 erl -make
-erl -kernel error_logger "{file,\"../forge.log\"}" -sname forgeinstaller -noinput -s shells install forgetester@$hostname -s init stop
+erl -sname extremeforge_install_tester -noinput &
+erl -kernel error_logger "{file,\"../install_errors.log\"}" \
+    -sname extremeforge_installer \
+    -noinput \
+    -run directory_tester run_once ".." extremeforge_install_tester@$hostname \
+    -s shells stop_node extremeforge_install_tester@$hostname \
+    -s init stop

trunk/src/adlib.erl

@@ -1 @@
-%%% Copyright (C) 2009 Dominic Williams
+%%% Copyright (C) Dominic Williams
 %%% All rights reserved.
 %%% See file COPYING.
 
--module(adlib).
+-module (adlib).
 -export ([compare_dict/2]).
 

trunk/src/compiler.erl

@@ +1 @@
+%%% Copyright (C) Dominic Williams
+%%% All rights reserved.
+%%% See file COPYING.
+
 -module (compiler).
 -export ([init/2]).

trunk/src/directory_tester.erl

@@ -3 +3 @@
 %%% See file COPYING.
 
--module(directory_tester).
+-module (directory_tester).
 -export ([init/1, init/2]).
 -export ([run_once/1, run_once/2]).

trunk/src/shells.erl

@@ -1 @@
-%%% Copyright (c) 2008 Dominic Williams, Nicolas Charpentier
+%%% Copyright (C) Dominic Williams, Nicolas Charpentier
 %%% All rights reserved.
 %%% See file COPYING.
 -module (shells).
--export ([install/1]).
+-export ([stop_node/1]).
 
-install ([Test_node]) ->
-    try
-        Self = self (),
-        spawn_link (fun () -> shells_tests: tests (test_node (Test_node), Self) end),
-        receive {Self, done} -> ok;
-                M -> io:fwrite ("tests_crash: ~p~n", [M])
-        after 30000 -> throw ("tests timed out~n")
-        end
+stop_node ([Node]) when is_atom (Node) ->
+    rpc: call (Node, init, stop, []).
 
-    catch C:E->
-            io: fwrite ("Caught: ~p~n", [{C,E, erlang:get_stacktrace()}])
-
-    after
-        io: fwrite ("Stopping test node: ~p~n", [Test_node]),
-      rpc: call (Test_node, init, stop, [])
-    end,
-    receive_all (),
-    io: fwrite ("done~n", []).
-
-test_node (Node) ->
-    case net_adm: ping(Node) of
-        pong ->
-            Node;
-        pang ->
-            [Name, Host] = string: tokens (atom_to_list (Node), "@"),
-            {ok, Real_node} = slave: start (Host, Name),
-            Real_node
-    end.
-
-receive_all () ->
-    receive
-        {'EXIT', _, normal} ->
-            receive_all ();
-        M ->
-            io:fwrite("Received ~p~n", [M]),
-            receive_all ()
-    after 500 ->
-           done
-    end.
-

trunk/src/tester.erl

@@ -1 @@
-%%% Copyright (c) 2008 Dominic Williams, Nicolas Charpentier
+%%% Copyright (C) Dominic Williams, Nicolas Charpentier
 %%% All rights reserved.
 %%% See file COPYING.

trunk/src/tester_test.erl

@@ -1 @@
-%%% Copyright (c) Dominic Williams, Nicolas Charpentier
+%%% Copyright (C) Dominic Williams, Nicolas Charpentier
 %%% All rights reserved.
 %%% See file COPYING.
 
 -module (tester_test).
--export ([run_all/1, run_all/0]).
+-export ([run_all/0]).
 -export ([tree/0]).
 -test (run_all).

trunk/src/tests_test.erl

@@ -1 @@
-%%% Copyright (c) Dominic Williams, Nicolas Charpentier
+%%% Copyright (C) Dominic Williams, Nicolas Charpentier
 %%% All rights reserved.
 %%% See file COPYING.