Changeset 95 for trunk/src/compiler_test.erl

Timestamp:

04/11/10 19:19:02 (22 months ago)

Author:

dom

Message:

Two improvements (and new start API): multiple directories watched, and slave started if no node given

File:

• trunk/src/compiler_test.erl (modified) (14 diffs)

trunk/src/compiler_test.erl

@@ -18 +18 @@
 -export ([reset_includes_none/0]).
 -export ([reset_includes_found/0]).
+-export ([can_be_given_several_directories/0]).
 -include_lib("stdlib/include/ms_transform.hrl").
 
@@ -25 +26 @@
     
 compiles_and_reports_progress_warnings_and_errors (Root, _) ->
-    Compiler = spawn_link (compiler, init, [notify_me (), Root]),
+    Compiler = spawn_link (compiler, init, [notify_me (), [Root]]),
     Compiler ! check,
     Ms = receive_all (),
@@ -35 +36 @@
 
 stops (Root, _) ->
-    Compiler = spawn_link (compiler, init, [notify_me (), Root]),
+    Compiler = spawn_link (compiler, init, [notify_me (), [Root]]),
     Compiler ! check,
     receive_all (),
@@ -68 +69 @@
     ok = fixtures: use_tree (Tree, F).
 
+can_be_given_several_directories () ->
+    Tree = [{directory, "src1", good_erl_tree ()},
+            {directory, "src2", [{file, "yo.erl", "-module(yo)."}]}],
+    ok = fixtures: use_tree (Tree, fun can_be_given_several_directories/2).
+
+can_be_given_several_directories (Root, _) ->
+    Dirs = [filename: join (Root, D) || D <- ["src1", "src2"]],
+    Compiler = spawn_link (compiler, init, [notify_me (), Dirs]),
+    Compiler ! check,
+    Ms = receive_all (),
+    Compiler ! stop,
+    [{3, 0, 0}, _, _, {3, 3, 3}, {{binaries, _}, _}] = Ms,
+    ok.
+    
 can_be_given_include_directories () ->
     Src = "-module(inc).\n-include(\"inc.hrl\").",
@@ -91 +106 @@
 
 adds_root_to_include_path (Root, _) ->
-    Compiler = spawn_link (compiler, init, [notify_me (), Root]),
+    Compiler = spawn_link (compiler, init, [notify_me (), [Root]]),
     Compiler ! check,
     Ms = receive_all (),
@@ -113 +128 @@
 
 discovers_hrl (Root, _) ->
-    Compiler = spawn_link (compiler, init, [notify_me (), Root]),
+    Compiler = spawn_link (compiler, init, [notify_me (), [Root]]),
     Compiler ! check,
     Ms = receive_all (),
@@ -121 +136 @@
 
 provides_binaries_when_all_compiled (Root, _) ->
-    Compiler = spawn_link (compiler, init, [notify_me (), Root]),
+    Compiler = spawn_link (compiler, init, [notify_me (), [Root]]),
     Compiler ! check,
     Ms = receive_all (),
@@ -133 +148 @@
 
 provides_all_binaries_not_just_latest_when_all_compiled (Root, [_, File]) ->
-    Compiler = spawn_link (compiler, init, [notify_me (), Root]),
+    Compiler = spawn_link (compiler, init, [notify_me (), [Root]]),
     Compiler ! check,
     [{2, 0, 0}, _, _, {2, 2, 1}] = receive_all (),
@@ -144 +159 @@
 
 recompiles_minimally_after_change (Root, _) ->
-    Compiler = spawn_link (compiler, init, [notify_me (), Root]),
+    Compiler = spawn_link (compiler, init, [notify_me (), [Root]]),
     Compiler ! check,
     receive_all (),
@@ -158 +173 @@
 
 can_start_empty_and_add_files (Root, []) ->
-    Compiler = spawn_link (compiler, init, [notify_me (), Root]),
+    Compiler = spawn_link (compiler, init, [notify_me (), [Root]]),
     Compiler ! check,
     [timeout] = receive_all (),
@@ -170 +185 @@
 
 notifies_removed_files (Root, [F, _]) ->
-    Compiler = spawn_link (compiler, init, [notify_me (), Root]),
+    Compiler = spawn_link (compiler, init, [notify_me (), [Root]]),
     Compiler ! check,
     receive_all (),
@@ -181 +196 @@
 
 notifies_removed_files_even_if_never_compiled (Root, [F]) ->
-    Compiler = spawn_link (compiler, init, [notify_me (), Root]),
+    Compiler = spawn_link (compiler, init, [notify_me (), [Root]]),
     Compiler ! check,
     [{1, 0, 0}, {_, _}, {1, 1, 0}] = receive_all (),
@@ -195 +210 @@
 include_no_directory (Root, _) ->
     Src = filename: join (Root, "src"),
-    Compiler = spawn_link (compiler, init, [notify_me (), Src]),
+    Compiler = spawn_link (compiler, init, [notify_me (), [Src]]),
     Compiler ! check,
     [{1, 0, 0}, {_, _}, {1, 1, 0}] = receive_all (),
@@ -204 +219 @@
     Src = filename: join (Root, "src"),
     Inc = filename: join (Root, "include"),
-    Compiler = spawn_link (compiler, init, [notify_me (), Src, [{i, Inc}]]),
+    Compiler = spawn_link (compiler, init, [notify_me (), [Src], [{i, Inc}]]),
     Compiler ! check,
     [{1, 0, 0}, {1, 1, 1}, {{binaries, _}, _}] = receive_all (),