Merge branch 'pan/testcase-fix-bigboot' into maint

* pan/testcase-fix-bigboot:
  Align java test Makefile.src with c tests ditto in ic
  Teach ei testsuites parallel make
  Teach edlin_expand_SUITE:init_per_suite independence
  Teach big_boot_embedded testcase about comte

OTP-10008

8 files changed, 92 insertions, 36 deletions

diff --git a/lib/ic/test/c_client_erl_server_SUITE_data/Makefile.src b/lib/ic/test/c_client_erl_server_SUITE_data/Makefile.src
index d5277eb256..53543a5bf0 100644
--- a/lib/ic/test/c_client_erl_server_SUITE_data/Makefile.src
+++ b/lib/ic/test/c_client_erl_server_SUITE_data/Makefile.src
@@ -122,24 +122,33 @@ EBINS = $(ERL_FILES:.erl=.@EMULATOR@)
 
 all: $(PGMS) $(EBINS)
 
+$(GEN_ERL_FILES) $(GEN_HRL_FILES):  c_erl_test.built_erl
+$(GEN_C_FILES) $(GEN_H_FILES): c_erl_test.built_c
+$(OBJS): $(GEN_C_FILES) $(GEN_H_FILES)
+$(EBINS): $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+
 clean:	
 	-rm -f $(OBJS) $(GEN_C_FILES) $(GEN_H_FILES) $(PGMS) \
-		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES) \
+		c_erl_test.built_erl c_erl_test.built_c
 	-del /F /Q $(OBJS) $(GEN_C_FILES) $(GEN_H_FILES) $(PGMS) \
-		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES) \
+		c_erl_test.built_erl c_erl_test.built_c
 
 $(PGMS): $(OBJS)
 	$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
 
-$(GEN_C_FILES) $(GEN_H_FILES): c_erl_test.idl
+c_erl_test.built_c: c_erl_test.idl
 	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,c_client}" c_erl_test.idl
+	echo done > c_erl_test.built_c
 
-$(GEN_ERL_FILES) $(GEN_HRL_FILES): c_erl_test.idl
+c_erl_test.built_erl: c_erl_test.idl
 	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,erl_genserv}" c_erl_test.idl
+	echo done > c_erl_test.built_erl
 
-.c@obj@:
+.c@obj@: 
 	$(CC) -c -o $*@obj@ $(CFLAGS) $<
 
-.erl.@EMULATOR@:
+.erl.@EMULATOR@: 
 	$(ERLC) -I $(IC_INCLUDE_PATH) $<
 
diff --git a/lib/ic/test/c_client_erl_server_proto_SUITE_data/Makefile.src b/lib/ic/test/c_client_erl_server_proto_SUITE_data/Makefile.src
index 8bc1a907a7..7d32ee4e87 100644
--- a/lib/ic/test/c_client_erl_server_proto_SUITE_data/Makefile.src
+++ b/lib/ic/test/c_client_erl_server_proto_SUITE_data/Makefile.src
@@ -122,25 +122,34 @@ EBINS = $(ERL_FILES:.erl=.@EMULATOR@)
 
 all: $(PGMS) $(EBINS)
 
+$(GEN_ERL_FILES) $(GEN_HRL_FILES):  c_erl_test.built_erl
+$(GEN_C_FILES) $(GEN_H_FILES): c_erl_test.built_c
+$(OBJS): $(GEN_C_FILES) $(GEN_H_FILES)
+$(EBINS): $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+
 clean:	
 	-rm -f $(OBJS) $(GEN_C_FILES) $(GEN_H_FILES) $(PGMS) \
-		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES) \
+		c_erl_test.built_erl c_erl_test.built_c
 	-del /F /Q $(OBJS) $(GEN_C_FILES) $(GEN_H_FILES) $(PGMS) \
-		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES) \
+		c_erl_test.built_erl c_erl_test.built_c
 
 $(PGMS): $(OBJS)
 	$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
 
-$(GEN_C_FILES) $(GEN_H_FILES): c_erl_test.idl
+c_erl_test.built_c: c_erl_test.idl
 	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,c_client}" \
 		"+{user_protocol,my}" c_erl_test.idl
+	echo done > c_erl_test.built_c
 
-$(GEN_ERL_FILES) $(GEN_HRL_FILES): c_erl_test.idl
+c_erl_test.built_erl: c_erl_test.idl
 	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,erl_genserv}" c_erl_test.idl
+	echo done > c_erl_test.built_erl
 
-.c@obj@:
+.c@obj@: 
 	$(CC) -c -o $*@obj@ $(CFLAGS) $<
 
-.erl.@EMULATOR@:
+.erl.@EMULATOR@: 
 	$(ERLC) -I $(IC_INCLUDE_PATH) $<
 
diff --git a/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/Makefile.src b/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/Makefile.src
index 2585341791..19c67734ca 100644
--- a/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/Makefile.src
+++ b/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/Makefile.src
@@ -122,25 +122,33 @@ EBINS = $(ERL_FILES:.erl=.@EMULATOR@)
 
 all: $(PGMS) $(EBINS)
 
+$(GEN_ERL_FILES) $(GEN_HRL_FILES):  c_erl_test.built_erl
+$(GEN_C_FILES) $(GEN_H_FILES): c_erl_test.built_c
+$(OBJS): $(GEN_C_FILES) $(GEN_H_FILES)
+$(EBINS): $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+
 clean:	
 	-rm -f $(OBJS) $(GEN_C_FILES) $(GEN_H_FILES) $(PGMS) \
-		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES) \
+		c_erl_test.built_erl c_erl_test.built_c
 	-del /F /Q $(OBJS) $(GEN_C_FILES) $(GEN_H_FILES) $(PGMS) \
-		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES) \
+		c_erl_test.built_erl c_erl_test.built_c
 
 $(PGMS): $(OBJS)
 	$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
 
-$(GEN_C_FILES) $(GEN_H_FILES): c_erl_test.idl
-	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,c_client}" \
-		"+{user_protocol,my}" "+{c_timeout,{5000,5000}}" c_erl_test.idl
+c_erl_test.built_c: c_erl_test.idl
+	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,c_client}" c_erl_test.idl
+	echo done > c_erl_test.built_c
 
-$(GEN_ERL_FILES) $(GEN_HRL_FILES): c_erl_test.idl
+c_erl_test.built_erl: c_erl_test.idl
 	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,erl_genserv}" c_erl_test.idl
+	echo done > c_erl_test.built_erl
 
-.c@obj@:
+.c@obj@: 
 	$(CC) -c -o $*@obj@ $(CFLAGS) $<
 
-.erl.@EMULATOR@:
+.erl.@EMULATOR@: 
 	$(ERLC) -I $(IC_INCLUDE_PATH) $<
 
diff --git a/lib/ic/test/erl_client_c_server_SUITE_data/Makefile.src b/lib/ic/test/erl_client_c_server_SUITE_data/Makefile.src
index 50cf9d4445..ac53d0a657 100644
--- a/lib/ic/test/erl_client_c_server_SUITE_data/Makefile.src
+++ b/lib/ic/test/erl_client_c_server_SUITE_data/Makefile.src
@@ -122,25 +122,34 @@ EBINS = $(ERL_FILES:.erl=.@EMULATOR@)
 
 all: $(PGMS) $(EBINS)
 
+$(GEN_ERL_FILES) $(GEN_HRL_FILES):  c_erl_test.built_erl
+$(GEN_C_FILES) $(GEN_H_FILES): c_erl_test.built_c
+$(OBJS): $(GEN_C_FILES) $(GEN_H_FILES)
+$(EBINS): $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+
 clean:	
 	-rm -f $(OBJS) $(GEN_C_FILES) $(GEN_H_FILES) $(PGMS) \
-		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES) \
+		c_erl_test.built_erl c_erl_test.built_c
 	-del /F /Q $(OBJS) $(GEN_C_FILES) $(GEN_H_FILES) $(PGMS) \
-		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES) \
+		c_erl_test.built_erl c_erl_test.built_c
 
 $(PGMS): $(OBJS)
 	$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
 
-$(GEN_C_FILES) $(GEN_H_FILES): erl_c_test.idl
+c_erl_test.built_c: erl_c_test.idl
 	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,c_server}" \
 	"+{scoped_op_calls,true}" erl_c_test.idl
+	echo done > c_erl_test.built_c
 
 # If we have scoped operation calls for C, we must have that for
 # Erlang as well, if we use the m_i.erl file for calling the server.
 
-$(GEN_ERL_FILES) $(GEN_HRL_FILES): erl_c_test.idl
+c_erl_test.built_erl: erl_c_test.idl
 	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,erl_genserv}" \
 	"+{scoped_op_calls,true}"  "+{timeout,true}" erl_c_test.idl
+	echo done > c_erl_test.built_erl
 
 .c@obj@:
 	$(CC) -c -o $*@obj@ $(CFLAGS) $<
diff --git a/lib/ic/test/erl_client_c_server_proto_SUITE_data/Makefile.src b/lib/ic/test/erl_client_c_server_proto_SUITE_data/Makefile.src
index 6c7701ca50..d23de04944 100644
--- a/lib/ic/test/erl_client_c_server_proto_SUITE_data/Makefile.src
+++ b/lib/ic/test/erl_client_c_server_proto_SUITE_data/Makefile.src
@@ -122,25 +122,34 @@ EBINS = $(ERL_FILES:.erl=.@EMULATOR@)
 
 all: $(PGMS) $(EBINS)
 
+$(GEN_ERL_FILES) $(GEN_HRL_FILES):  c_erl_test.built_erl
+$(GEN_C_FILES) $(GEN_H_FILES): c_erl_test.built_c
+$(OBJS): $(GEN_C_FILES) $(GEN_H_FILES)
+$(EBINS): $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+
 clean:	
 	-rm -f $(OBJS) $(GEN_C_FILES) $(GEN_H_FILES) $(PGMS) \
-		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES) \
+		c_erl_test.built_erl c_erl_test.built_c
 	-del /F /Q $(OBJS) $(GEN_C_FILES) $(GEN_H_FILES) $(PGMS) \
-		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES) \
+		c_erl_test.built_erl c_erl_test.built_c
 
 $(PGMS): $(OBJS)
 	$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
 
-$(GEN_C_FILES) $(GEN_H_FILES): erl_c_test.idl
+c_erl_test.built_c: erl_c_test.idl
 	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,c_server}" \
 	"+{scoped_op_calls,true}" erl_c_test.idl
+	echo done > c_erl_test.built_c
 
 # If we have scoped operation calls for C, we must have that for
 # Erlang as well, if we use the m_i.erl file for calling the server.
 
-$(GEN_ERL_FILES) $(GEN_HRL_FILES): erl_c_test.idl
+c_erl_test.built_erl: erl_c_test.idl
 	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,erl_genserv}" \
 	"+{scoped_op_calls,true}"  "+{timeout,true}" erl_c_test.idl
+	echo done > c_erl_test.built_erl
 
 .c@obj@:
 	$(CC) -c -o $*@obj@ $(CFLAGS) $<
diff --git a/lib/ic/test/java_client_erl_server_SUITE_data/Makefile.src b/lib/ic/test/java_client_erl_server_SUITE_data/Makefile.src
index 5e190fe1a5..0d84a62270 100644
--- a/lib/ic/test/java_client_erl_server_SUITE_data/Makefile.src
+++ b/lib/ic/test/java_client_erl_server_SUITE_data/Makefile.src
@@ -69,20 +69,29 @@ EBINS = $(ERL_FILES:.erl=.@EMULATOR@)
 
 all: $(CLASS_FILES) $(EBINS)
 
+$(GEN_ERL_FILES) $(GEN_HRL_FILES):  java_erl_test.built_erl
+$(GEN_JAVA_FILES): java_erl_test.built_java
+$(CLASS_FILES): $(GEN_JAVA_FILES)
+$(EBINS): $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+
 clean:	
 	-rm -f $(GEN_JAVA_FILES) $(CLASS_FILES) \
-		$(GEN_ERL_FILES) $(GEN_HRL_FILES) $(EBINS) 
+		$(GEN_ERL_FILES) $(GEN_HRL_FILES) $(EBINS) \
+		java_erl_test.built_erl java_erl_test.built_java
 	-del /F /Q $(GEN_JAVA_FILES) $(CLASS_FILES) \
-		$(GEN_ERL_FILES) $(GEN_HRL_FILES) $(EBINS) 
+		$(GEN_ERL_FILES) $(GEN_HRL_FILES) $(EBINS) \
+		java_erl_test.built_erl java_erl_test.built_java
 
-$(GEN_JAVA_FILES) : java_erl_test.idl
+java_erl_test.built_java: java_erl_test.idl
 	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,java}" java_erl_test.idl
+	echo done > java_erl_test.built_java
 
 $(CLASS_FILES) : $(JAVA_FILES)
 	$(JAVAC) -classpath $(CLASSPATH) $(JAVA_FILES)
 
-$(GEN_ERL_FILES) $(GEN_HRL_FILES): java_erl_test.idl
+java_erl_test.built_erl: java_erl_test.idl
 	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,erl_genserv}" java_erl_test.idl
+	echo done > java_erl_test.built_erl
 
 .erl.@EMULATOR@:
 	$(ERLC) -I $(IC_INCLUDE_PATH) $<
diff --git a/lib/kernel/test/code_SUITE.erl b/lib/kernel/test/code_SUITE.erl
index 99b0cd2ffb..4dfa92a755 100644
--- a/lib/kernel/test/code_SUITE.erl
+++ b/lib/kernel/test/code_SUITE.erl
@@ -1441,6 +1441,9 @@ filter_app("netconf",_) ->
 % Safe has the same kind of error in the .app file as ic
 filter_app("safe",_) ->
     false;
+% Comte cannot be started in the "usual" way
+filter_app("comte",_) ->
+    false;
 % OS_mon does not find it's port program when running cerl
 filter_app("os_mon",true) ->
     false;
diff --git a/lib/stdlib/test/edlin_expand_SUITE.erl b/lib/stdlib/test/edlin_expand_SUITE.erl
index a0e198ce09..f8d4fb4b6a 100644
--- a/lib/stdlib/test/edlin_expand_SUITE.erl
+++ b/lib/stdlib/test/edlin_expand_SUITE.erl
@@ -46,10 +46,10 @@ groups() ->
     [].
 
 init_per_suite(Config) ->
-    true = code:delete(expand_test),
-    true = code:delete(expand_test1),
-    true = code:delete('ExpandTestCaps'),
-    true = code:delete('ExpandTestCaps1'),
+    (catch code:delete(expand_test)),
+    (catch code:delete(expand_test1)),
+    (catch code:delete('ExpandTestCaps')),
+    (catch code:delete('ExpandTestCaps1')),
     Config.
 
 end_per_suite(_Config) ->