Merge branch 'sverk/cross_tests/OTP-10074' into maint

* sverk/cross_tests/OTP-10074:
  Fix include issues in when building tests
  Fix cross compile of testcases
  Update cross build system for tests to work

4 files changed, 51 insertions, 1 deletions

diff --git a/erts/test/erl_print_SUITE_data/Makefile.src b/erts/test/erl_print_SUITE_data/Makefile.src
index dec5650416..ebcbb10c15 100644
--- a/erts/test/erl_print_SUITE_data/Makefile.src
+++ b/erts/test/erl_print_SUITE_data/Makefile.src
@@ -22,6 +22,8 @@ include @erts_lib_include_internal_generated@@[email protected]
 CC = @CC@
 CFLAGS = @ERTS_CFLAGS@
 LIBS = @ERTS_LIBS@
+CP=cp
+CHMOD=chmod
 
 EPTF_CFLAGS = -Wall $(CFLAGS) @DEFS@ -I@erts_lib_include_internal@ -I@erts_lib_include_internal_generated@
 EPTF_LIBS = $(LIBS) -L@erts_lib_internal_path@ -lerts_internal@type_marker@
@@ -31,12 +33,18 @@ EPTT_LIBS = -L@erts_lib_internal_path@ -lerts_internal_r@type_marker@ $(ETHR_LIB
 
 GCC = .@DS@gccifier -CC"$(CC)"
 
-PROGS = erl_print_tests.@emu_threads@@exe@
+PROGS = erl_print_tests.true@exe@ erl_print_tests.false@exe@
 
 all: $(PROGS)
 
+@IFEQ@ (@cross@, yes)
+gccifier@exe@:
+	$(CP) ..@DS@utils@[email protected] gccifier@exe@
+	$(CHMOD) a+x gccifier@exe@
+@ELSE@
 gccifier@exe@: ..@DS@utils@[email protected]
 	$(CC) $(CFLAGS) -o gccifier@exe@ ..@DS@utils@[email protected] $(LIBS)
+@ENDIF@
 
 erl_print_tests.false@exe@: gccifier@exe@ erl_print_tests.c
 	$(GCC) $(EPTF_CFLAGS) -o erl_print_tests.false@exe@ erl_print_tests.c $(EPTF_LIBS)
diff --git a/erts/test/erlexec_SUITE_data/Makefile.src b/erts/test/erlexec_SUITE_data/Makefile.src
index b751547b8f..970a905c32 100644
--- a/erts/test/erlexec_SUITE_data/Makefile.src
+++ b/erts/test/erlexec_SUITE_data/Makefile.src
@@ -20,6 +20,8 @@
 CC = @CC@
 CFLAGS = @ERTS_CFLAGS@
 LIBS = @ERTS_LIBS@
+CP=cp
+CHMOD=chmod
 
 ERLX_T_CFLAGS = -Wall $(ERLX_DEFS) $(CFLAGS) @DEFS@
 
@@ -29,8 +31,14 @@ PROGS = erlexec_tests@exe@
 
 all: $(PROGS)
 
+@IFEQ@ (@cross@, yes)
+gccifier@exe@:
+	$(CP) ..@DS@utils@[email protected] gccifier@exe@
+	$(CHMOD) a+x gccifier@exe@
+@ELSE@
 gccifier@exe@: ..@DS@utils@[email protected]
 	$(CC) $(CFLAGS) -o gccifier@exe@ ..@DS@utils@[email protected] $(LIBS)
+@ENDIF@
 
 erlexec_tests@exe@: gccifier@exe@ erlexec_tests.c
 	$(GCC) $(ERLX_T_CFLAGS) -o erlexec_tests@exe@ erlexec_tests.c
diff --git a/erts/test/ethread_SUITE_data/Makefile.src b/erts/test/ethread_SUITE_data/Makefile.src
index 132b23344c..f93a31178b 100644
--- a/erts/test/ethread_SUITE_data/Makefile.src
+++ b/erts/test/ethread_SUITE_data/Makefile.src
@@ -23,6 +23,8 @@ include @erts_lib_include_internal_generated@@DS@erts_internal.mk
 CC = @CC@
 CFLAGS = @ERTS_CFLAGS@
 LIBS = @ERTS_LIBS@
+CP=cp
+CHMOD=chmod
 
 ETHR_T_CFLAGS = -Wall $(ETHR_DEFS) $(CFLAGS) @DEFS@ -I@erts_lib_include_internal@ -I@erts_lib_include_internal_generated@
 ETHR_T_LIBS = $(LIBS) -L@erts_lib_internal_path@ $(ETHR_LIBS) $(ERTS_INTERNAL_X_LIBS)
@@ -33,8 +35,14 @@ PROGS = ethread_tests@exe@
 
 all: $(PROGS)
 
+@IFEQ@ (@cross@, yes)
+gccifier@exe@:
+	$(CP) ..@DS@utils@[email protected] gccifier@exe@
+	$(CHMOD) a+x gccifier@exe@
+@ELSE@
 gccifier@exe@: ..@DS@utils@[email protected]
 	$(CC) $(CFLAGS) -o gccifier@exe@ ..@DS@utils@[email protected] $(LIBS)
+@ENDIF@
 
 ethread_tests@exe@: gccifier@exe@ ethread_tests.c
 	$(GCC) $(ETHR_T_CFLAGS) -o ethread_tests@exe@ ethread_tests.c -lerts_internal_r $(ETHR_T_LIBS)
diff --git a/erts/test/utils/gccifier.sh b/erts/test/utils/gccifier.sh
new file mode 100755
index 0000000000..4c6ba35db2
--- /dev/null
+++ b/erts/test/utils/gccifier.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 2005-2009. All Rights Reserved.
+#
+# The contents of this file are subject to the Erlang Public License,
+# Version 1.1, (the "License"); you may not use this file except in
+# compliance with the License. You should have received a copy of the
+# Erlang Public License along with this software. If not, it can be
+# retrieved online at http://www.erlang.org/.
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+# the License for the specific language governing rights and limitations
+# under the License.
+#
+# %CopyrightEnd%
+#
+
+CC=`echo "$1" | sed -e "s/-CC//"`
+shift
+echo "->"
+echo "$CC $*"
+$CC $*
+echo ""