Changes in trunk/test/testrun_2b.sh [30:19]

File:

• trunk/test/testrun_2b.sh (modified) (7 diffs)

trunk/test/testrun_2b.sh

@@ -1 +1 @@
 #! /bin/sh
-
-#
-# Copyright Rainer Wichmann (2006)
-#
-# License Information:
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
 
 LOGFILE="$PW_DIR/.samhain_log"; export LOGFILE
@@ -26 +7 @@
 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
 
-CLIENT_BUILDOPTS="--quiet  $TRUST --enable-micro-stealth=137 --enable-debug --enable-network=client --enable-srp --prefix=$PW_DIR --with-tmp-dir=$PW_DIR --localstatedir=$PW_DIR --with-config-file=REQ_FROM_SERVER${RCFILE_C} --with-data-file=REQ_FROM_SERVER$PW_DIR/.samhain_file --with-logserver=localhost  --with-log-file=$LOGFILE --with-pid-file=$PW_DIR/.samhain_lock"; export CLIENT_BUILDOPTS
+CLIENT_BUILDOPTS="--quiet  $TRUST --enable-micro-stealth=137 --enable-debug --enable-network=client --enable-srp --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=REQ_FROM_SERVER${RCFILE_C} --with-data-file=REQ_FROM_SERVER$PW_DIR/.samhain_file --with-logserver=localhost  --with-log-file=$LOGFILE --with-pid-file=$PW_DIR/.samhain_lock"; export CLIENT_BUILDOPTS
 
 testrun2b_internal ()
@@ -80 +61 @@
 
     cp samhain samhain.build || return 1
-    $MAKE clean >/dev/null || return 1
+    make clean >/dev/null || return 1
     
     ${TOP_SRCDIR}/configure ${SERVER_BUILDOPTS}
@@ -144 +125 @@
     rm -f ./.samhain_lock
     
-    SHCLT=`./yule -P $SHPW`
+    SHCLT=`./yule -P $SHPW | sed s%HOSTNAME%${SH_LOCALHOST}%`
     
     if test x$? = x0; then
@@ -153 +134 @@
     fi
     
-    SHCLT1=`echo "${SHCLT}"  | sed s%HOSTNAME%${SH_LOCALHOST}%`
-    AHOST=`find_hostname`
-    SHCLT2=`echo "${SHCLT}"  | sed s%HOSTNAME%${AHOST}%`
-        
-
-    echo $SHCLT1 >> testrc_2
-    echo $SHCLT2 >> testrc_2
-
+    echo $SHCLT >> testrc_2
     
     cp    "${RCFILE_C}"              ./rc.${SH_LOCALHOST}
@@ -166 +140 @@
 
     ALTHOST=`find_hostname`
-    cp    "${RCFILE_C}"          "./rc.${ALTHOST}"
+    cp    ./testrc_2       "./rc.${ALTHOST}"
     cp    ./file.${SH_LOCALHOST} "./file.${ALTHOST}" 2>/dev/null
 }
@@ -192 +166 @@
     
             testrun2b_internal "$GPG"
-
-            SAVE_VALGRIND="${VALGRIND}"; VALGRIND=''; export VALGRIND
+    
             do_test_1_a
-            VALGRIND="${SAVE_VALGRIND}"; export VALGRIND 
             if [ $? -eq 0 ]; then
                 [ -z "$quiet" ] && log_ok   1 ${MAXTEST} "Client download+logging w/gpg";