@ -145,14 +145,14 @@ make_cmd(TestDir, Config) ->
undefined - >
undefined - >
? FMT ( " erl " % should we expand ERL_PATH ?
? FMT ( " erl " % should we expand ERL_PATH ?
" -noshell -pa ~s ~s "
" -noshell -pa ~s ~s "
" -name test@ ~s "
" ~s "
" -logdir \" ~s \" "
" -logdir \" ~s \" "
" -env TEST_DIR \" ~s \" "
" -env TEST_DIR \" ~s \" "
" ~s "
" ~s "
" -s ct_run script_start -s erlang halt " ,
" -s ct_run script_start -s erlang halt " ,
[ CodePathString ,
[ CodePathString ,
Include ,
Include ,
net_adm : localhost ( ) ,
build_name ( Config ) ,
LogDir ,
LogDir ,
filename : join ( Cwd , TestDir ) ,
filename : join ( Cwd , TestDir ) ,
get_extra_params ( Config ) ] ) ++
get_extra_params ( Config ) ] ) ++
@ -164,14 +164,14 @@ make_cmd(TestDir, Config) ->
SpecFlags - >
SpecFlags - >
? FMT ( " erl " % should we expand ERL_PATH ?
? FMT ( " erl " % should we expand ERL_PATH ?
" -noshell -pa ~s ~s "
" -noshell -pa ~s ~s "
" -name test@ ~s "
" ~s "
" -logdir \" ~s \" "
" -logdir \" ~s \" "
" -env TEST_DIR \" ~s \" "
" -env TEST_DIR \" ~s \" "
" ~s "
" ~s "
" -s ct_run script_start -s erlang halt " ,
" -s ct_run script_start -s erlang halt " ,
[ CodePathString ,
[ CodePathString ,
Include ,
Include ,
net_adm : localhost ( ) ,
build_name ( Config ) ,
LogDir ,
LogDir ,
filename : join ( Cwd , TestDir ) ,
filename : join ( Cwd , TestDir ) ,
get_extra_params ( Config ) ] ) ++
get_extra_params ( Config ) ] ) ++
@ -180,6 +180,12 @@ make_cmd(TestDir, Config) ->
RawLog = filename : join ( LogDir , " raw.log " ) ,
RawLog = filename : join ( LogDir , " raw.log " ) ,
{ Cmd , RawLog } .
{ Cmd , RawLog } .
build_name ( Config ) - >
case rebar_config : get_local ( Config , ct_use_short_names , false ) of
true - > " -sname test " ;
false - > " -name test@ " ++ net_adm : localhost ( )
end .
get_extra_params ( Config ) - >
get_extra_params ( Config ) - >
rebar_config : get_local ( Config , ct_extra_params , " " ) .
rebar_config : get_local ( Config , ct_extra_params , " " ) .