diff options
| author | Tuncer Ayaz <tuncer.ayaz@gmail.com> | 2011-07-13 20:22:03 +0200 |
|---|---|---|
| committer | Tuncer Ayaz <tuncer.ayaz@gmail.com> | 2011-07-14 13:03:54 +0200 |
| commit | 4e0ab4065f3fdf81574d60d26e072386f6244c37 (patch) | |
| tree | 49930819d668b929f09d5b358a4c6093107636b7 | |
| parent | 12b26fab32a1477d0d762ceea329291c86730528 (diff) | |
Fix grep portability (Reported-by: Andrew Thompson)
| -rwxr-xr-x | priv/templates/simplenode.runner | 4 | ||||
| -rw-r--r-- | src/rebar_ct.erl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/priv/templates/simplenode.runner b/priv/templates/simplenode.runner index d2ef73f..bacce8d 100755 --- a/priv/templates/simplenode.runner +++ b/priv/templates/simplenode.runner @@ -23,14 +23,14 @@ cd $RUNNER_BASE_DIR mkdir -p $RUNNER_LOG_DIR # Extract the target node name from node.args -NAME_ARG=`egrep -e '^-s?name' $RUNNER_ETC_DIR/vm.args` +NAME_ARG=`egrep '^-s?name' $RUNNER_ETC_DIR/vm.args` if [ -z "$NAME_ARG" ]; then echo "vm.args needs to have either -name or -sname parameter." exit 1 fi # Extract the target cookie -COOKIE_ARG=`grep -e '^-setcookie' $RUNNER_ETC_DIR/vm.args` +COOKIE_ARG=`grep '^-setcookie' $RUNNER_ETC_DIR/vm.args` if [ -z "$COOKIE_ARG" ]; then echo "vm.args needs to have a -setcookie parameter." exit 1 diff --git a/src/rebar_ct.erl b/src/rebar_ct.erl index 7ce6142..2b6c5e3 100644 --- a/src/rebar_ct.erl +++ b/src/rebar_ct.erl @@ -90,7 +90,7 @@ clear_log(RawLog) -> %% log results check_log(RawLog) -> {ok, Msg} = - rebar_utils:sh("grep -e 'TEST COMPLETE' -e '{error,make_failed}' " + rebar_utils:sh("egrep -e 'TEST COMPLETE' -e '{error,make_failed}' " ++ RawLog, [{use_stdout, false}]), MakeFailed = string:str(Msg, "{error,make_failed}") =/= 0, RunFailed = string:str(Msg, ", 0 failed") =:= 0, |