diff options
| author | Lukas Larsson <[email protected]> | 2012-05-03 10:34:05 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2012-05-03 10:34:05 +0200 |
| commit | b17c18daa8b502fc32fa977a133b590463f68857 (patch) | |
| tree | 8022df877675862b8c089faeea3aa0ec687730a9 /lib/test_server/src/ts_make.erl | |
| parent | 7edca403c98cd00f016b6f6ad66d9e5ce36a9b9e (diff) | |
| parent | c5d6ce6a07478c5ac19fdf2df244c4b837888d08 (diff) | |
| download | otp-b17c18daa8b502fc32fa977a133b590463f68857.tar.gz otp-b17c18daa8b502fc32fa977a133b590463f68857.tar.bz2 otp-b17c18daa8b502fc32fa977a133b590463f68857.zip | |
Merge branch 'maint'
* maint:
Fix include issues in when building tests
Fix cross compile of testcases
Update cross build system for tests to work
Diffstat (limited to 'lib/test_server/src/ts_make.erl')
| -rw-r--r-- | lib/test_server/src/ts_make.erl | 8 |
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) -> |