| Message ID | 20180525062531.30549-1-yixin.zhang@intel.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Petr Vorel |
| Headers | show |
| Series | runltp: fix shellcheck error for sending email | expand |
Hi Yixin, > runltp:894:11: error: Couldn't parse this test expression. [SC1073] > runltp:894:13: error: If grouping expressions inside [..], use \( ..\). [SC1026] > runltp:894:15: error: Expected test to end here (don't wrap commands in []/[[]]). > Fix any mentioned problems and try again. [SC1072] > Also change '-o' to '&&' according to the comment and context. > Signed-off-by: Yixin Zhang <yixin.zhang@intel.com> > --- > runltp | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > diff --git a/runltp b/runltp > index 51357fadf..c6e5b03e8 100755 > --- a/runltp > +++ b/runltp > @@ -891,7 +891,7 @@ main() > fi > if [ "$ALT_EMAIL_OUT" -eq 1 ] ; then ## User wants reports to be e-mailed > - if [ [ ! "$HTMLFILE_NAME" ] -o [ ! "$OUTPUTFILE_NAME" ] -o [ ! "$LOGFILE_NAME" ] ] ; then > + if [ -z "$HTMLFILE_NAME" ] && [ -z "$OUTPUTFILE_NAME" ] && [ -z "$LOGFILE_NAME" ]; then Actually this if clause shouldn't be here as $LOGFILE_NAME is always defined: l) LOGFILE_NAME="$OPTARG" case $OPTARG in /*) LOGFILE="-l $OPTARG" ;; *) LOGFILE="-l $LTPROOT/results/$OPTARG" ALT_DIR_RES=1 ;; esac ;; .... if [ ! "$LOGFILE" ]; then ## User has not mentioned about Log File name LOGFILE_NAME="$DEFAULT_FILE_NAME_GENERATION_TIME" Could you please just delete it? I'm looking forward the day when this crazy script is replaced by new runner. Kind regards, Petr
diff --git a/runltp b/runltp index 51357fadf..c6e5b03e8 100755 --- a/runltp +++ b/runltp @@ -891,7 +891,7 @@ main() fi if [ "$ALT_EMAIL_OUT" -eq 1 ] ; then ## User wants reports to be e-mailed - if [ [ ! "$HTMLFILE_NAME" ] -o [ ! "$OUTPUTFILE_NAME" ] -o [ ! "$LOGFILE_NAME" ] ] ; then + if [ -z "$HTMLFILE_NAME" ] && [ -z "$OUTPUTFILE_NAME" ] && [ -z "$LOGFILE_NAME" ]; then ##User does not have output/logs/html-output, nothing to be mailed in this situation echo "Nothing to be mailed here...." else
runltp:894:11: error: Couldn't parse this test expression. [SC1073] runltp:894:13: error: If grouping expressions inside [..], use \( ..\). [SC1026] runltp:894:15: error: Expected test to end here (don't wrap commands in []/[[]]). Fix any mentioned problems and try again. [SC1072] Also change '-o' to '&&' according to the comment and context. Signed-off-by: Yixin Zhang <yixin.zhang@intel.com> --- runltp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)