aboutsummaryrefslogtreecommitdiffstats
path: root/lib/test_server/src/ts_make.erl
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2012-03-19 16:52:14 +0100
committerLukas Larsson <[email protected]>2012-05-02 09:51:44 +0200
commitb834e188e6a2df3b2fd689618d43e6f878a5d1e4 (patch)
treeb0c0fd1191d9cba7b04231226c30e6af006f297a /lib/test_server/src/ts_make.erl
parent5573888eea1ff6e3e169a6c873c2f5ada81eab62 (diff)
downloadotp-b834e188e6a2df3b2fd689618d43e6f878a5d1e4.tar.gz
otp-b834e188e6a2df3b2fd689618d43e6f878a5d1e4.tar.bz2
otp-b834e188e6a2df3b2fd689618d43e6f878a5d1e4.zip
Update cross build system for tests to work
ts has been fixed to again work in a cross build environment. See ts:help() and xcomp/README.md for details about how it works.
Diffstat (limited to 'lib/test_server/src/ts_make.erl')
-rw-r--r--lib/test_server/src/ts_make.erl8
1 files changed, 4 insertions, 4 deletions
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) ->