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

8 files changed, 221 insertions, 148 deletions

diff --git a/lib/test_server/src/configure.in b/lib/test_server/src/configure.in
index 097853bcfc..77bc993ccd 100644
--- a/lib/test_server/src/configure.in
+++ b/lib/test_server/src/configure.in
@@ -108,7 +108,7 @@ AC_CHECK_HEADER(poll.h, AC_DEFINE(HAVE_POLL_H))
 # for the system.
 
 AC_MSG_CHECKING([system version (for dynamic loading)])
-system=`uname -s`-`uname -r`
+system=`./config.sub $host`
 AC_MSG_RESULT($system)
 
 # Step 2: check for existence of -ldl library.  This is needed because
@@ -119,10 +119,9 @@ AC_CHECK_LIB(dl, dlopen, have_dl=yes, have_dl=no)
 # Step 3: set configuration options based on system name and version.
 
 SHLIB_LDLIBS=
-
 fullSrcDir=`cd $srcdir; pwd`
 case $system in
-    Linux*)
+    *-linux-*)
 	SHLIB_CFLAGS="-fPIC"
 	SHLIB_SUFFIX=".so"
 	if test "$have_dl" = yes; then
@@ -136,7 +135,7 @@ case $system in
 	fi
 	SHLIB_EXTRACT_ALL=""
 	;;
-    NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly*)
+    *-netbsd*|*-freebsd*|*-openbsd*|*-dragonfly*)
 	# Not available on all versions:  check for include file.
 	AC_CHECK_HEADER(dlfcn.h, [
 	    SHLIB_CFLAGS="-fpic"
@@ -153,28 +152,21 @@ case $system in
 	])
 	SHLIB_EXTRACT_ALL=""
 	;;
-    SunOS-4*)
-	SHLIB_CFLAGS="-PIC"
-	SHLIB_LD="ld"
-	SHLIB_LDFLAGS="$LDFLAGS"
-	SHLIB_SUFFIX=".so"
-	SHLIB_EXTRACT_ALL=""
-	;;
-    SunOS-5*|UNIX_SV-4.2*)
+    *-solaris2*|*-sysv4*)
 	SHLIB_CFLAGS="-KPIC"
 	SHLIB_LD="/usr/ccs/bin/ld"
 	SHLIB_LDFLAGS="$LDFLAGS -G -z text"
 	SHLIB_SUFFIX=".so"
 	SHLIB_EXTRACT_ALL="-z allextract"
 	;;
-    Darwin*)
+    *darwin*)
 	SHLIB_CFLAGS="-fno-common"
 	SHLIB_LD="cc"
 	SHLIB_LDFLAGS="$LDFLAGS -bundle -flat_namespace -undefined suppress"
 	SHLIB_SUFFIX=".so"
 	SHLIB_EXTRACT_ALL=""
 	;;
-    OSF1*)
+    *osf1*)
 	SHLIB_CFLAGS="-fPIC"
 	SHLIB_LD="ld"
 	SHLIB_LDFLAGS="$LDFLAGS -shared"
@@ -206,19 +198,19 @@ esac
 
 if test "$CC" = "gcc" -o `$CC -v 2>&1 | grep -c gcc` != "0" ; then
 	case $system in
-	    AIX-*)
+	    *-aix)
 		;;
-	    BSD/OS*)
+	    *-bsd*)
 		;;
-	    IRIX*)
+	    *-irix)
 		;;
-	    NetBSD-*|FreeBSD-*|OpenBSD-*)
+	    *-netbsd|*-freebsd|*-openbsd)
 		;;
-	    RISCos-*)
+	    *-riscos)
 		;;
-	    ULTRIX-4.*)
+	    *ultrix4.*)
 		;;
-	    Darwin*)
+	    *darwin*)
 		;;
 	    *)
 		SHLIB_CFLAGS="-fPIC"
diff --git a/lib/test_server/src/ts.erl b/lib/test_server/src/ts.erl
index cb06264adb..4899f38d2b 100644
--- a/lib/test_server/src/ts.erl
+++ b/lib/test_server/src/ts.erl
@@ -27,9 +27,10 @@
 -export([run/0, run/1, run/2, run/3, run/4,
 	 clean/0, clean/1,
 	 tests/0, tests/1,
-	 install/0, install/1, install/2, index/0,
+	 install/0, install/1, index/0,
 	 estone/0, estone/1,
 	 cross_cover_analyse/1,
+	 compile_testcases/0, compile_testcases/1,
 	 help/0]).
 -export([i/0, l/1, r/0, r/1, r/2, r/3]).
 
@@ -88,35 +89,25 @@
 -define(
    install_help,
    [
-    "  ts:install()      - Install TS for local target with no Options.\n"
-    "  ts:install([Options])\n",
-    "                    - Install TS for local target with Options\n"
-    "  ts:install({Architecture, Target_name})\n",
-    "                    - Install TS for a remote target architecture.\n",
-    "                      and target network name (e.g. {vxworks_cpu32, sauron}).\n",
-    "  ts:install({Architecture, Target_name}, [Options])\n",
-    "                    - Install TS as above, and with Options.\n",
+    "  ts:install()           - Install TS with no Options.\n"
+    "  ts:install([Options])  - Install TS with Options\n"
     "\n",
     "Installation options supported:\n",
     "  {longnames, true} - Use fully qualified hostnames\n",
-    "  {hosts, [HostList]}\n"
-    "                    - Use theese hosts for distributed testing.\n"
     "  {verbose, Level}  - Sets verbosity level for TS output (0,1,2), 0 is\n"
     "                      quiet(default).\n"
-    "  {slavetargets, SlaveTarges}\n"
-    "                    - Available hosts for starting slave nodes for\n"
-    "                      platforms which cannot have more than one erlang\n"
-    "                      node per host.\n"
-    "  {crossroot, TargetErlRoot}\n"
-    "                    - Erlang root directory on target host\n"
-    "                      Mandatory for remote targets\n"
-    "  {master, {MasterHost, MasterCookie}}\n"
-    "                    - Master host and cookie for targets which are\n"
-    "                      started as slave nodes.\n"
-    "                      erl_boot_server must be started on master before\n"
-    "                      test is run.\n"
-    "                      Optional, default is controller host and then\n"
-    "                      erl_boot_server is started autmatically\n"
+    "  {crossroot, ErlTop}\n"
+    "                    - Erlang root directory on build host, ~n"
+    "                      normally same value as $ERL_TOP\n"
+    "  {crossenv, [{Key,Val}]}\n"
+    "                    - Environmentals used by test configure on build host\n"
+    "  {crossflags, FlagsString}\n"
+    "                    - Flags used by test configure on build host\n"
+    "  {xcomp, XCompFile}\n"
+    "                    - The xcomp file to use for cross compiling the~n"
+    "                      testcases. Using this option will override any~n"
+    "                      cross* configurations given to ts. Note that you~n"
+    "                      have to have a correct ERL_TOP as well.~n"
    ]).
 
 help() ->
@@ -183,26 +174,24 @@ help(installed) ->
 	 "                      cover_details. Analyses modules specified in\n"
 	 "                      cross.cover.\n"
 	 "                      Level can be 'overview' or 'details'.\n",
+	 "  ts:compile_testcases()~n"
+	 "  ts:compile_testcases(Apps)~n"
+	 "                    - Compile all testcases for usage in a cross ~n"
+	 "                      compile environment."
 	 " \n"
 	 "Installation (already done):\n"
 	],
     show_help([H,?install_help]).
 
 show_help(H) ->
-    io:put_chars(lists:flatten(H)).
+    io:format(lists:flatten(H)).
 
 
 %% Installs tests.
 install() ->
     ts_install:install(install_local,[]).
-install({Architecture, Target_name})  ->
-    ts_install:install({ts_lib:maybe_atom_to_list(Architecture), 
-			ts_lib:maybe_atom_to_list(Target_name)}, []);
 install(Options) when is_list(Options) ->
     ts_install:install(install_local,Options).
-install({Architecture, Target_name}, Options) when is_list(Options)->
-    ts_install:install({ts_lib:maybe_atom_to_list(Architecture), 
-			ts_lib:maybe_atom_to_list(Target_name)}, Options).
 
 %% Updates the local index page.
 
@@ -728,3 +717,23 @@ cover_type(cover_details) -> details.
 do_load(Mod) ->
     code:purge(Mod),
     code:load_file(Mod).
+
+
+compile_testcases() ->
+    compile_datadirs("../*/*_data").
+
+compile_testcases(App) when is_atom(App) ->
+    compile_testcases([App]);
+compile_testcases([App | T]) ->
+    compile_datadirs(io_lib:format("../~s_test/*_data", [App])),
+    compile_testcases(T);
+compile_testcases([]) ->
+    ok.
+
+compile_datadirs(DataDirs) ->
+    {ok,Variables} = file:consult("variables"),
+
+    lists:foreach(fun(Dir) ->
+			  ts_lib:make_non_erlang(Dir, Variables)
+		  end,
+		  filelib:wildcard(DataDirs)).
diff --git a/lib/test_server/src/ts.hrl b/lib/test_server/src/ts.hrl
index 885a726c54..db804d23a1 100644
--- a/lib/test_server/src/ts.hrl
+++ b/lib/test_server/src/ts.hrl
@@ -28,6 +28,7 @@
 -define(run_summary, "suite.summary").
 -define(cover_total,"total_cover.log").
 -define(variables, "variables").
+-define(cross_variables, "variables-cross").
 -define(LF, [10]).                              % Newline in VxWorks script
 -define(CHAR_PER_LINE, 60).                     % Characters per VxWorks script building line
 -define(CROSS_COOKIE, "cross").                 % cookie used when cross platform testing
diff --git a/lib/test_server/src/ts_erl_config.erl b/lib/test_server/src/ts_erl_config.erl
index 5585e8ccd3..ed26156180 100644
--- a/lib/test_server/src/ts_erl_config.erl
+++ b/lib/test_server/src/ts_erl_config.erl
@@ -220,10 +220,6 @@ erl_interface(Vars,OsType) ->
 		    _ -> 
 			"" % VxWorks
 		end,
-    CrossCompile = case OsType of
-		       vxworks -> "true";
-		       _ ->       "false"
-		   end,
     [{erl_interface_libpath, filename:nativename(LibPath)},
      {erl_interface_sock_libs, sock_libraries(OsType)},
      {erl_interface_lib, Lib},
@@ -232,8 +228,8 @@ erl_interface(Vars,OsType) ->
      {erl_interface_eilib_drv, Lib1Drv},
      {erl_interface_threadlib, ThreadLib},
      {erl_interface_include, filename:nativename(Incl)},
-     {erl_interface_mk_include, filename:nativename(MkIncl)},
-     {erl_interface_cross_compile, CrossCompile} | Vars].
+     {erl_interface_mk_include, filename:nativename(MkIncl)}
+     | Vars].
 
 ic(Vars, OsType) ->
     {ClassPath, LibPath, Incl} =
@@ -276,8 +272,6 @@ lib_dir(Vars, Lib) ->
     case {get_var(crossroot, Vars), LibLibDir} of
 	{{error, _}, _} ->			%no crossroot
 	    LibLibDir;
-	{_, {error, _}} ->			%no lib
-	    LibLibDir;
 	{CrossRoot, _} ->
 	    %% XXX: Ugly. So ugly I won't comment it
 	    %% /Patrik
@@ -299,18 +293,16 @@ lib_dir(Vars, Lib) ->
     end.
 
 erl_root(Vars) ->
-    Root = code:root_dir(),
-    case ts_lib:erlang_type() of
+    Root = case get_var(crossroot,Vars) of
+	       {error, notfound} -> code:root_dir();
+	       CrossRoot -> CrossRoot
+	   end,
+    case ts_lib:erlang_type(Root) of
 	{srctree, _Version} ->
 	    Target = get_var(target, Vars),
 	    {srctree, Root, Target};
 	{_, _Version} ->
-	    case get_var(crossroot,Vars) of
-		{error, notfound} ->
-		    {installed, Root};
-		CrossRoot ->
-		    {installed, CrossRoot}
-	    end
+	    {installed, Root}
     end.
 
 
diff --git a/lib/test_server/src/ts_install.erl b/lib/test_server/src/ts_install.erl
index 9703478f20..c70a41be4b 100644
--- a/lib/test_server/src/ts_install.erl
+++ b/lib/test_server/src/ts_install.erl
@@ -28,12 +28,25 @@ install(install_local, Options) ->
     install(os:type(), Options);
 
 install(TargetSystem, Options) ->
-    io:format("Running configure for cross architecture, network target name~n"
-	      "~p~n", [TargetSystem]),
-    case autoconf(TargetSystem) of
+    case file:consult(?variables) of
+	{ok, Vars} ->
+	    case proplists:get_value(cross,Vars) of
+		"yes" when Options == []->
+		    target_install(Vars);
+		_ ->
+		    build_install(TargetSystem, Options)
+	    end;
+	_ ->
+	    build_install(TargetSystem, Options)
+    end.
+
+
+build_install(TargetSystem, Options) ->
+    XComp = parse_xcomp_file(proplists:get_value(xcomp,Options)),
+    case autoconf(TargetSystem, XComp++Options) of
 	{ok, Vars0} ->
 	    OsType = os_type(TargetSystem),
-	    Vars1 = ts_erl_config:variables(merge(Vars0,Options),OsType),
+	    Vars1 = ts_erl_config:variables(Vars0++XComp++Options,OsType),
 	    {Options1, Vars2} = add_vars(Vars1, Options),
 	    Vars3 = lists:flatten([Options1|Vars2]),
 	    write_terms(?variables, Vars3);
@@ -45,32 +58,43 @@ os_type({unix,_}=OsType) -> OsType;
 os_type({win32,_}=OsType) -> OsType;
 os_type(_Other) -> vxworks.
 
-merge(Vars,[]) ->
-    Vars;
-merge(Vars,[{crossroot,X}| Tail]) ->
-    merge([{crossroot, X} | Vars], Tail);
-merge(Vars,[_X | Tail]) ->
-    merge(Vars,Tail).
+target_install(CrossVars) ->
+    io:format("Cross installation detected, skipping configure and data_dir make~n"),
+    case file:rename(?variables,?cross_variables) of
+	ok ->
+	    ok;
+	_ ->
+	    io:format("Could not find variables file from cross make~n"),
+	    throw(cross_installation_failed)
+    end,
+    CPU = proplists:get_value('CPU',CrossVars),
+    OS = proplists:get_value(os,CrossVars),
+    {Options,Vars} = add_vars([{cross,"yes"},{'CPU',CPU},{os,OS}],[]),
+    Variables = lists:flatten([Options|Vars]),
+    write_terms(?variables, Variables).
 
 %% Autoconf for various platforms.
 %% unix uses the configure script
 %% win32 uses ts_autoconf_win32
 %% VxWorks uses ts_autoconf_vxworks.
 
-autoconf(TargetSystem) ->
-    case autoconf1(TargetSystem) of
+autoconf(TargetSystem, XComp) ->
+    case autoconf1(TargetSystem, XComp) of
 	ok ->
 	    autoconf2(file:read_file("conf_vars"));
 	Error ->
 	    Error
     end.
 
-autoconf1({win32, _}) ->
+autoconf1({win32, _},[{cross,"no"}]) ->
     ts_autoconf_win32:configure();
-autoconf1({unix, _}) ->
-    unix_autoconf();
-autoconf1(Other) ->
-    ts_autoconf_vxworks:configure(Other).
+autoconf1({unix, _},XCompFile) ->
+    unix_autoconf(XCompFile);
+autoconf1(Other,[{cross,"no"}]) ->
+    ts_autoconf_vxworks:configure(Other);
+autoconf1(_,_) ->
+    io:format("cross compilation not supported for that this platform~n"),
+    throw(cross_installation_failed).
 
 autoconf2({ok, Bin}) ->
     get_vars(binary_to_list(Bin), name, [], []);
@@ -92,27 +116,40 @@ get_vars([], name, [], Result) ->
 get_vars(_, _, _, _) ->
     {error, fatal_bad_conf_vars}.
 
-unix_autoconf() ->
+unix_autoconf(XConf) ->
     Configure = filename:absname("configure"),
-    Args = case catch erlang:system_info(threads) of
-	       false -> "";
-	       _ -> " --enable-shlib-thread-safety"
-	   end
-	++ case catch string:str(erlang:system_info(system_version),
-				 "debug") > 0 of
-	       false -> "";
-	       _ -> " --enable-debug-mode"
-	   end,
+    Flags = proplists:get_value(crossflags,XConf,[]),
+    Env = proplists:get_value(crossenv,XConf,[]),
+    Host = get_xcomp_flag("host", Flags),
+    Build = get_xcomp_flag("build", Flags),
+    Threads = [" --enable-shlib-thread-safety" ||
+		  erlang:system_info(threads) /= false],
+    Debug = [" --enable-debug-mode" ||
+		string:str(erlang:system_info(system_version),"debug") > 0],
+    Args = Host ++ Build ++ Threads ++ Debug,
     case filelib:is_file(Configure) of
 	true ->
-	    Env = macosx_cflags(),
-	    Port = open_port({spawn, Configure ++ Args},
-			     [stream, eof, {env,Env}]),
+	    OSXEnv = macosx_cflags(),
+	    io:format("Running ~sEnv: ~p~n",
+		      [lists:flatten(Configure ++ Args),Env++OSXEnv]),
+	    Port = open_port({spawn, lists:flatten(Configure ++ Args)},
+			     [stream, eof, {env,Env++OSXEnv}]),
 	    ts_lib:print_data(Port);
 	false ->
 	    {error, no_configure_script}
     end.
 
+
+get_xcomp_flag(Flag, Flags) ->
+    get_xcomp_flag(Flag, Flag, Flags).
+get_xcomp_flag(Flag, Tag, Flags) ->
+    case proplists:get_value(Flag,Flags) of
+	undefined -> "";
+	"guess" -> [" --",Tag,"=",os:cmd("$ERL_TOP/erts/autoconf/config.guess")];
+	HostVal -> [" --",Tag,"=",HostVal]
+    end.
+
+
 macosx_cflags() ->
     case os:type() of
 	{unix, darwin} ->
@@ -125,10 +162,33 @@ macosx_cflags() ->
 	    []
     end.
 
+parse_xcomp_file(undefined) ->
+    [{cross,"no"}];
+parse_xcomp_file(Filepath) ->
+    {ok,Bin} = file:read_file(Filepath),
+    Lines = binary:split(Bin,<<"\n">>,[global,trim]),
+    {Envs,Flags} = parse_xcomp_file(Lines,[],[]),
+    [{cross,"yes"},{crossroot,os:getenv("ERL_TOP")},
+     {crossenv,Envs},{crossflags,Flags}].
+
+parse_xcomp_file([<<A:8,_/binary>> = Line|R],Envs,Flags)
+  when $A =< A, A =< $Z ->
+    [Var,Value] = binary:split(Line,<<"=">>),
+    parse_xcomp_file(R,[{binary_to_list(Var),
+			 binary_to_list(Value)}|Envs],Flags);
+parse_xcomp_file([<<"erl_xcomp_",Line/binary>>|R],Envs,Flags) ->
+    [Var,Value] = binary:split(Line,<<"=">>),
+    parse_xcomp_file(R,Envs,[{binary_to_list(Var),
+			      binary_to_list(Value)}|Flags]);
+parse_xcomp_file([_|R],Envs,Flags) ->
+    parse_xcomp_file(R,Envs,Flags);
+parse_xcomp_file([],Envs,Flags) ->
+    {lists:reverse(Envs),lists:reverse(Flags)}.
+
 write_terms(Name, Terms) ->
     case file:open(Name, [write]) of
 	{ok, Fd} ->
-	    Result = write_terms1(Fd, Terms),
+	    Result = write_terms1(Fd, remove_duplicates(Terms)),
 	    file:close(Fd),
 	    Result;
 	{error, Reason} ->
@@ -141,6 +201,17 @@ write_terms1(Fd, [Term|Rest]) ->
 write_terms1(_, []) ->
     ok.
 
+remove_duplicates(List) ->
+    lists:reverse(
+      lists:foldl(fun({Key,Val},Acc) ->
+			  R = make_ref(),
+			  case proplists:get_value(Key,Acc,R) of
+			      R -> [{Key,Val}|Acc];
+			      _Else ->
+				  Acc
+			  end
+		  end,[],List)).
+
 add_vars(Vars0, Opts0) ->
     {Opts,LongNames} =
 	case lists:keymember(longnames, 1, Opts0) of
diff --git a/lib/test_server/src/ts_install_cth.erl b/lib/test_server/src/ts_install_cth.erl
index a41916fd0a..67f2df0cae 100644
--- a/lib/test_server/src/ts_install_cth.erl
+++ b/lib/test_server/src/ts_install_cth.erl
@@ -95,17 +95,12 @@ pre_init_per_suite(_Suite,Config,State) ->
     try
 	{ok,Variables} = 
 	    file:consult(filename:join(State#state.ts_conf_dir,"variables")),
-
-	%% Make the stuff in all_SUITE_data if it exists
-	AllDir = filename:join(DataDir,"../all_SUITE_data"),
-	case filelib:is_dir(AllDir) of
-	    true ->
-		make_non_erlang(AllDir,Variables);
-	    false ->
-		ok
+	case proplists:get_value(cross,Variables) of
+	    "yes" ->
+		ct:log("Not making data dir as tests have been cross compiled");
+	    _ ->
+		ts_lib:make_non_erlang(DataDir, Variables)
 	end,
-	
-	make_non_erlang(DataDir, Variables),
 
 	{add_node_name(Config, State), State}
     catch Error:Reason ->
@@ -219,39 +214,6 @@ terminate(_State) ->
 %%% ============================================================================
 %%% Local functions
 %%% ============================================================================
-%% Configure and run all the Makefiles in the data dirs of the suite 
-%% in question
-make_non_erlang(DataDir, Variables) ->
-    {ok,CurrWD} = file:get_cwd(),
-    try
-	file:set_cwd(DataDir),
-	MakeCommand = proplists:get_value(make_command,Variables),
-	
-	FirstMakefile = filename:join(DataDir,"Makefile.first"),
-	case filelib:is_regular(FirstMakefile) of
-	    true ->
-		ct:log("Making ~p",[FirstMakefile]),
-		ok = ts_make:make(
-		       MakeCommand, DataDir, filename:basename(FirstMakefile));
-	    false ->
-		ok
-	end,
-	
-	MakefileSrc = filename:join(DataDir,"Makefile.src"),
-	MakefileDest = filename:join(DataDir,"Makefile"),
-	case filelib:is_regular(MakefileSrc) of
-	    true ->
-		ok = ts_lib:subst_file(MakefileSrc,MakefileDest,Variables),
-		ct:log("Making ~p",[MakefileDest]),
-		ok = ts_make:make([{makefile,"Makefile"},{data_dir,DataDir} 
-				   | Variables]);
-	    false ->
-		ok
-	end
-    after
-	file:set_cwd(CurrWD),
-	timer:sleep(100)
-    end.
 
 %% Add a nodename to config if it does not exist
 add_node_name(Config, State) ->
diff --git a/lib/test_server/src/ts_lib.erl b/lib/test_server/src/ts_lib.erl
index 2f0a4ea8c0..d521d2beda 100644
--- a/lib/test_server/src/ts_lib.erl
+++ b/lib/test_server/src/ts_lib.erl
@@ -24,10 +24,12 @@
 %% Avoid warning for local function error/1 clashing with autoimported BIF.
 -compile({no_auto_import,[error/1]}).
 -export([error/1, var/2, erlang_type/0,
+	 erlang_type/1,
 	 initial_capital/1, interesting_logs/1, 
 	 specs/1, suites/2, last_test/1,
 	 force_write_file/2, force_delete/1,
 	 subst_file/3, subst/2, print_data/1,
+	 make_non_erlang/2,
 	 maybe_atom_to_list/1, progress/4
 	]).
 
@@ -73,8 +75,10 @@ progress(Vars, Level, Format, Args) ->
 %% Returns: {Type, Version} where Type is otp|src
 
 erlang_type() ->
+    erlang_type(code:root_dir()).
+erlang_type(RootDir) ->
     {_, Version} = init:script_id(),
-    RelDir = filename:join(code:root_dir(), "releases"), % Only in installed
+    RelDir = filename:join(RootDir, "releases"), % Only in installed
     case filelib:is_file(RelDir) of
 	true -> {otp,Version};			% installed OTP
 	false -> {srctree,Version}		% source code tree
@@ -333,3 +337,45 @@ maybe_atom_to_list(To_list) when is_list(To_list) ->
 maybe_atom_to_list(To_list) when is_atom(To_list)->
     atom_to_list(To_list).
     
+
+%% Configure and run all the Makefiles in the data dir of the suite
+%% in question
+make_non_erlang(DataDir, Variables) ->
+    %% Make the stuff in all_SUITE_data if it exists
+    AllDir = filename:join(DataDir,"../all_SUITE_data"),
+    case filelib:is_dir(AllDir) of
+	true ->
+	    make_non_erlang_do(AllDir,Variables);
+	false ->
+	    ok
+    end,
+    make_non_erlang_do(DataDir, Variables).
+
+make_non_erlang_do(DataDir, Variables) ->
+    try
+	MakeCommand = proplists:get_value(make_command,Variables),
+
+	FirstMakefile = filename:join(DataDir,"Makefile.first"),
+	case filelib:is_regular(FirstMakefile) of
+	    true ->
+		io:format("Making ~p",[FirstMakefile]),
+		ok = ts_make:make(
+		       MakeCommand, DataDir, filename:basename(FirstMakefile));
+	    false ->
+		ok
+	end,
+
+	MakefileSrc = filename:join(DataDir,"Makefile.src"),
+	MakefileDest = filename:join(DataDir,"Makefile"),
+	case filelib:is_regular(MakefileSrc) of
+	    true ->
+		ok = ts_lib:subst_file(MakefileSrc,MakefileDest,Variables),
+		io:format("Making ~p",[MakefileDest]),
+		ok = ts_make:make([{makefile,"Makefile"},{data_dir,DataDir}
+				   | Variables]);
+	    false ->
+		ok
+	end
+    after
+	timer:sleep(100)  %% maybe unnecessary now when we don't do set_cwd anymore
+    end.
diff --git a/lib/test_server/src/ts_make.erl b/lib/test_server/src/ts_make.erl
index 3df66111a3..f0db60013a 100644
--- a/lib/test_server/src/ts_make.erl
+++ b/lib/test_server/src/ts_make.erl
@@ -25,12 +25,12 @@
 %% Functions to be called from make test cases.
 
 make(Config) when is_list(Config) ->
-    DataDir = ?config(data_dir, Config),
-    Makefile = ?config(makefile, Config),
-    Make = ?config(make_command, Config),
+    DataDir = proplists:get_value(data_dir, Config),
+    Makefile = proplists:get_value(makefile, Config),
+    Make = proplists:get_value(make_command, Config),
     case make(Make, DataDir, Makefile) of
 	ok -> ok;
-	{error,Reason} -> ?t:fail({make_failed,Reason})
+	{error,Reason} -> exit({make_failed,Reason})
     end.
 
 unmake(Config) when is_list(Config) ->