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

nicely on Windows and Linux both.

svn path=/trunk/; revision=52428

test/config.sh

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

test/suite-decryption.sh

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

test/suite-nameres.sh

@@ -158,13 +158,8 @@ name_resolution_cleanup_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"
-	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
 	mkdir -p "$CUSTOM_PROFILE_PATH"

test/test.sh

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