osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Slight simplification, inline a function only ever called once. 

svn path=/trunk/; revision=52470
This commit is contained in:
Evan Huus 2013-10-09 17:24:16 +00:00
parent 7058b87833
commit 4860e101c8
2 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
test/config.sh
View File

@ -99,23 +99,6 @@ export WIRESHARK_QUIT_AFTER_CAPTURE="True"
CAPTURE_DIR="$TESTS_DIR/captures/"
test_build_paths() {
# Configuration paths
HOME_ENV="HOME"
HOME_PATH="$TEST_OUTDIR/home"
CONF_PATH="$HOME_PATH/.wireshark"
if [ "$WS_SYSTEM" == "Windows" ] ; then
HOME_ENV="APPDATA"
HOME_PATH="`cygpath -w $HOME_PATH`"
CONF_PATH="$HOME_PATH/Wireshark"
CAPTURE_DIR="`cygpath -w $CAPTURE_DIR`"
fi
mkdir -p $CONF_PATH
}
# Display our environment
##printf "\n ------- Info =-----------------\n"

14
test/test.sh
View File

@ -75,7 +75,19 @@ if [ -z "$TEST_OUTDIR" ] || ! cd "$TEST_OUTDIR"; then
TEST_OUTDIR_CLEAN=0
fi
test_build_paths
# Configuration paths
HOME_ENV="HOME"
HOME_PATH="$TEST_OUTDIR/home"
CONF_PATH="$HOME_PATH/.wireshark"
if [ "$WS_SYSTEM" == "Windows" ] ; then
HOME_ENV="APPDATA"
HOME_PATH="`cygpath -w $HOME_PATH`"
CONF_PATH="$HOME_PATH/Wireshark"
CAPTURE_DIR="`cygpath -w $CAPTURE_DIR`"
fi
mkdir -p $CONF_PATH
source $TESTS_DIR/suite-clopts.sh
source $TESTS_DIR/suite-io.sh