Ignore:
Timestamp:
Jul 18, 2015, 5:06:52 PM (6 years ago)
Author:
katerina
Message:

Enhancements and fixes for tickets #374, #375, #376, #377, #378, and #379.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/test/testrun_2a.sh

    r472 r481  
    2323RCFILE="$PW_DIR/testrc_2";  export RCFILE
    2424
    25 SERVER_BUILDOPTS="--quiet  $TRUST --enable-network=server --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=REQ_FROM_SERVER$PW_DIR/testrc_2 --with-data-file=REQ_FROM_SERVER$PW_DIR/.samhain_file --with-logserver=${SH_LOCALHOST}  --with-log-file=$PW_DIR/.samhain_log --with-pid-file=$PW_DIR/.samhain_lock"; export SERVER_BUILDOPTS
    26 
    27 CLIENT_BUILDOPTS="--quiet  $TRUST --enable-network=client --enable-srp --prefix=$PW_DIR --with-tmp-dir=$PW_DIR --localstatedir=$PW_DIR --with-config-file=REQ_FROM_SERVER$RCFILE --with-data-file=REQ_FROM_SERVER$PW_DIR/.samhain_file  --with-log-file=$LOGFILE --with-pid-file=$PW_DIR/.samhain_lock --enable-suidcheck"; export CLIENT_BUILDOPTS
     25SERVER_BUILDOPTS="--quiet  $TRUST --enable-network=server --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=REQ_FROM_SERVER$PW_DIR/testrc_2 --with-data-file=REQ_FROM_SERVER$PW_DIR/.samhain_file --with-logserver=${SH_LOCALHOST}  --with-log-file=$PW_DIR/.samhain_log --with-pid-file=$PW_DIR/.samhain_lock --enable-debug=gdb"; export SERVER_BUILDOPTS
     26
     27CLIENT_BUILDOPTS="--quiet  $TRUST --enable-network=client --enable-srp --prefix=$PW_DIR --with-tmp-dir=$PW_DIR --localstatedir=$PW_DIR --with-config-file=REQ_FROM_SERVER$RCFILE --with-data-file=REQ_FROM_SERVER$PW_DIR/.samhain_file  --with-log-file=$LOGFILE --with-pid-file=$PW_DIR/.samhain_lock --enable-suidcheck --enable-debug"; export CLIENT_BUILDOPTS
    2828
    2929do_test_1_a () {
     
    233233}
    234234
    235 MAXTEST=6; export MAXTEST
     235MAXTEST=4; export MAXTEST
    236236
    237237testrun2a ()
     
    280280    fi
    281281    #
    282     SERVER_BUILDOPTS="${SERVER_BUILDOPTS_ORIG} --enable-encrypt=1"; export SERVER_BUILDOPTS
    283     CLIENT_BUILDOPTS="${CLIENT_BUILDOPTS_ORIG} --enable-encrypt=1"; export CLIENT_BUILDOPTS
     282    SERVER_BUILDOPTS="${SERVER_BUILDOPTS_ORIG} --disable-ipv6"; export SERVER_BUILDOPTS
     283    CLIENT_BUILDOPTS="${CLIENT_BUILDOPTS_ORIG} --disable-ipv6"; export CLIENT_BUILDOPTS
    284284    #
    285285    testrun2a_internal
    286286    do_test_1_a
    287287    if [ $? -eq 0 ]; then
    288         [ -z "$quiet" ] && log_ok   4 ${MAXTEST} "Encryption (v1)";
     288        [ -z "$quiet" ] && log_ok   4 ${MAXTEST} "IPv6 disabled";
    289289    else
    290         [ -z "$quiet" ] && log_fail 4 ${MAXTEST} "Encryption (v1)";
    291     fi
    292     #
    293     SERVER_BUILDOPTS="${SERVER_BUILDOPTS_ORIG}"; export SERVER_BUILDOPTS
    294     CLIENT_BUILDOPTS="${CLIENT_BUILDOPTS_ORIG} --enable-encrypt=1"; export CLIENT_BUILDOPTS
    295     #
    296     testrun2a_internal
    297     do_test_1_a
    298     if [ $? -eq 0 ]; then
    299         [ -z "$quiet" ] && log_ok   5 ${MAXTEST} "Encryption backward compat";
    300     else
    301         [ -z "$quiet" ] && log_fail 5 ${MAXTEST} "Encryption backward compat";
    302     fi
    303     #
    304     SERVER_BUILDOPTS="${SERVER_BUILDOPTS_ORIG} --disable-ipv6"; export SERVER_BUILDOPTS
    305     CLIENT_BUILDOPTS="${CLIENT_BUILDOPTS_ORIG} --disable-ipv6"; export CLIENT_BUILDOPTS
    306     #
    307     testrun2a_internal
    308     do_test_1_a
    309     if [ $? -eq 0 ]; then
    310         [ -z "$quiet" ] && log_ok   6 ${MAXTEST} "IPv6 disabled";
    311     else
    312         [ -z "$quiet" ] && log_fail 6 ${MAXTEST} "IPv6 disabled";
     290        [ -z "$quiet" ] && log_fail 4 ${MAXTEST} "IPv6 disabled";
    313291    fi
    314292    #
Note: See TracChangeset for help on using the changeset viewer.