osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

More tweaking of test suite path variables, trying to make everything play 

nicely on Windows and Linux both.

svn path=/trunk/; revision=52428
This commit is contained in:
Evan Huus 2013-10-06 23:29:59 +00:00
parent 0c25744c67
commit 087c885c66
4 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
test/config.sh
View File

@ -99,13 +99,22 @@ export WIRESHARK_QUIT_AFTER_CAPTURE="True"
CAPTURE_DIR="$TESTS_DIR/captures/" CAPTURE_DIR="$TESTS_DIR/captures/"
# Configuration paths test_build_paths() {
HOME_ENV="HOME"
if [ "$WS_SYSTEM" == "Windows" ] ; then # Configuration paths
HOME_ENV="APPDATA" HOME_ENV="HOME"
CAPTURE_DIR="`cygpath -w $CAPTURE_DIR`" HOME_PATH="$TEST_OUTDIR/home"
fi 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 # Display our environment

7
test/suite-decryption.sh
View File

@ -135,15 +135,12 @@ decryption_cleanup_step() {
decryption_prep_step() { decryption_prep_step() {
decryption_cleanup_step decryption_cleanup_step
TEST_HOME="$TEST_OUTDIR/home" TS_DC_ENV="${HOME_ENV}=${HOME_PATH}"
DOTWS_DIR="$TEST_HOME/.wireshark"
TS_DC_ENV="${HOME_ENV}=${TEST_HOME}"
mkdir -p "$DOTWS_DIR"
for UAT in $UAT_FILES ; do for UAT in $UAT_FILES ; do
sed -e "s|TEST_KEYS_DIR|${TEST_KEYS_DIR//\\/\\\\x5c}|" \ sed -e "s|TEST_KEYS_DIR|${TEST_KEYS_DIR//\\/\\\\x5c}|" \
< "$TESTS_DIR/config/$UAT.tmpl" \ < "$TESTS_DIR/config/$UAT.tmpl" \
> "$DOTWS_DIR/$UAT" > "$CONF_PATH/$UAT"
done done
} }

7
test/suite-nameres.sh
View File

@ -158,13 +158,8 @@ name_resolution_cleanup_step() {
} }
name_resolution_prep_step() { name_resolution_prep_step() {
if [ "$WS_SYSTEM" == "Windows" ] ; then
CONF_PATH="$TEST_OUTDIR/home/Wireshark"
else
CONF_PATH="$TEST_OUTDIR/home/.wireshark"
fi
CUSTOM_PROFILE_PATH="$CONF_PATH/profiles/$CUSTOM_PROFILE_NAME" CUSTOM_PROFILE_PATH="$CONF_PATH/profiles/$CUSTOM_PROFILE_NAME"
TS_NR_ENV="WIRESHARK_RUN_FROM_BUILD_DIRECTORY=1 ${HOME_ENV}=${TEST_OUTDIR}/home" TS_NR_ENV="WIRESHARK_RUN_FROM_BUILD_DIRECTORY=1 ${HOME_ENV}=${HOME_PATH}"
name_resolution_cleanup_step name_resolution_cleanup_step
mkdir -p "$CUSTOM_PROFILE_PATH" mkdir -p "$CUSTOM_PROFILE_PATH"

2
test/test.sh
View File

@ -82,6 +82,8 @@ if [ -z "$TEST_OUTDIR" ] || ! cd "$TEST_OUTDIR"; then
TEST_OUTDIR_CLEAN=0 TEST_OUTDIR_CLEAN=0
fi fi
test_build_paths
test_cleanup() { test_cleanup() {
if [ $TEST_OUTDIR_CLEAN = 1 ]; then if [ $TEST_OUTDIR_CLEAN = 1 ]; then
# display contents of test outputs, ignore directory: # display contents of test outputs, ignore directory: