Changeset 592 for trunk/test


Ignore:
Timestamp:
Oct 31, 2026, 7:16:07 PM (4 days ago)
Author:
katerina
Message:

Fixes for compiler warnings.

Location:
trunk/test
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/test/testrun_1.sh

    r481 r592  
    11001100        fi
    11011101        #
    1102         # wtmp may not be readable
    1103         #
    1104         tmp=`./samhain -j -L $LOGFILE | grep ERR | grep -v wtmp | wc -l`
     1102        # wtmp may not be readable -- and utmp may not exist anymore
     1103        #
     1104        tmp=`./samhain -j -L $LOGFILE | grep ERR | grep -v wtmp | grep -v utmp | wc -l`
    11051105        if [ $tmp -ne 0 ]; then
    11061106            [ -z "$verbose" ] || log_msg_fail "errors during check";

  • trunk/test/testrun_1a.sh

    r481 r592  
    5555        return 1
    5656    fi
    57     "$CONVERT" --help | grep  ImageMagick >/dev/null 2>&1
     57    "$CONVERT" -version | grep  ImageMagick >/dev/null 2>&1
    5858    if [ $? -ne 0 ]; then
    5959        [ -z "$verbose" ] || log_msg_fail "Convert utility is not ImageMagick convert";

  • trunk/test/testrun_1b.sh

    r562 r592  
    363363            #
    364364            PRECONV=`find_path convert`
    365             "${PRECONV}" --help | grep  ImageMagick >/dev/null 2>&1 && \
     365            "${PRECONV}" -version | grep  ImageMagick >/dev/null 2>&1 && \
    366366                CONVERT="${PRECONV}"
    367367

  • trunk/test/testrun_1i.sh

    r561 r592  
    299299            #
    300300            PRECONV=`find_path convert`
    301             "${PRECONV}" --help | grep  ImageMagick >/dev/null 2>&1 && \
     301            "${PRECONV}" -version | grep  ImageMagick >/dev/null 2>&1 && \
    302302                CONVERT="${PRECONV}"
    303303
Note: See TracChangeset for help on using the changeset viewer.