diff options
| author | Lukas Larsson <[email protected]> | 2014-01-28 11:24:46 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2014-01-28 11:24:46 +0100 |
| commit | 53602cc4c7e4cfb363d93d8452d7323534531886 (patch) | |
| tree | 08bc398f72c9267a1816d6947c785dbc6d221c4c | |
| parent | 9c9fc59620b0e48d357be1e2d1faeb411d2fe31c (diff) | |
| parent | 4343225d9d26a5c2476bc083c686e2a3816df506 (diff) | |
| download | otp-53602cc4c7e4cfb363d93d8452d7323534531886.tar.gz otp-53602cc4c7e4cfb363d93d8452d7323534531886.tar.bz2 otp-53602cc4c7e4cfb363d93d8452d7323534531886.zip | |
Merge branch 'lukas/erts/cerl_R17_to_17_fixes/OTP-11615'
* lukas/erts/cerl_R17_to_17_fixes/OTP-11615:
erts: fix unicode printing of gdb printouts
cerl: Fix target detection on freebsd
New version number does not start with an R
| -rw-r--r-- | erts/etc/unix/cerl.src | 7 | ||||
| -rw-r--r-- | erts/test/z_SUITE.erl | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/erts/etc/unix/cerl.src b/erts/etc/unix/cerl.src index be8343e87e..78fefbea55 100644 --- a/erts/etc/unix/cerl.src +++ b/erts/etc/unix/cerl.src @@ -86,6 +86,7 @@ run_valgrind=no # Default rootdir ROOTDIR=%SRC_ROOTDIR% BINDIR="$ROOTDIR/bin/`$ROOTDIR/erts/autoconf/config.guess`" +TARGET=%TARGET% #BINDIR="$ROOTDIR/bin/%TARGET%" PROGNAME=$ROOTDIR/bin/cerl EMU=beam @@ -248,6 +249,12 @@ while [ $# -gt 0 ]; do done +if [ ! -f $BINDIR/erlexec -a -f $ROOTDIR/bin/$TARGET/erlexec ]; then + # We are in a strange target (I'm looking at you openbsd) where + # TARGET != config.guess + BINDIR=$ROOTDIR/bin/$TARGET +fi + PATH=$BINDIR:$ROOTDIR/bin:$PATH EXEC=$BINDIR/erlexec diff --git a/erts/test/z_SUITE.erl b/erts/test/z_SUITE.erl index da72b18f05..056561d3db 100644 --- a/erts/test/z_SUITE.erl +++ b/erts/test/z_SUITE.erl @@ -116,7 +116,7 @@ find_cerl(false) -> end; find_cerl(DBTop) -> case catch filelib:wildcard(filename:join([DBTop, - "otp_src_R*", + "otp_src_*", "bin", "cerl"])) of [Cerl | _ ] -> @@ -242,7 +242,7 @@ dump_core(#core_search_conf{ cerl = Cerl }, Core) -> _ -> os:cmd(Cerl ++ " -dump " ++ Core) end, - ct:log("~s~n~n~s",[Core,Dump]). + ct:log("~ts~n~n~ts",[Core,Dump]). format_core(Conf, {ignore, Core}) -> |