Merge pull request #16 from jmtd/master

test-extract: Use mktemp for working directory

test/test-extract

@@ -22,9 +22,11 @@
 
 . test_common.sh
 
-run_sandbox=/tmp/extract1
-w_sandbox=/tmp/extract2
-gather_sandbox=/tmp/extract3
+wd="$(mktemp -td lhasa-test-extract.XXXXX)"
+trap "rmdir '$wd'" INT EXIT
+run_sandbox="$wd/extract1"
+w_sandbox="$wd/extract2"
+gather_sandbox="$wd/extract3"
 
 remove_sandboxes() {
 	if [ -e "$run_sandbox" ]; then
@@ -208,9 +210,14 @@ lha_check_output() {
 	#echo "lha_check_output: $@"
 	local expected_output="$1"
 	shift
+        output="$wd/output.txt"
 
 	cd "$run_sandbox"
-	test_lha "$@" >/tmp/output.txt 2>&1
+	test_lha "$@" >"$output" 2>&1
+
+	# test outputs have their test root as '/tmp'; adjust accordingly
+	sed -i "s,$wd,/tmp,g" "$output"
+
 	cd "$test_base"
 
 	if $GATHER && [ ! -e "$expected_output" ]; then
@@ -219,12 +226,12 @@ lha_check_output() {
 		cd "$test_base"
 	fi
 
-	if ! diff -u "$expected_output" /tmp/output.txt; then
+	if ! diff -u "$expected_output" "$output"; then
 		fail "Output not as expected for command:" \
 		     "    lha $*" >&2
 	fi
 
-	rm -f /tmp/output.txt
+	rm -f "$output"
 }
 
 # Basic 'lha e' extract.
@@ -305,6 +312,7 @@ test_q1_option() {
 	shift
 
 	make_sandboxes
+	expected="$wd/expected.txt"
 
 	for filename in "$@"; do
 		local symlink=$(get_file_data "$archive_file" \
@@ -314,14 +322,14 @@ test_q1_option() {
 		else
 			printf "\r$filename :\r$filename\t- Melted  \n"
 		fi
-	done >/tmp/expected.txt
+	done >"$expected"
 
-	lha_check_output /tmp/expected.txt \
+	lha_check_output "$expected" \
 	                 eq1 $(test_arc_file "$archive_file")
 
 	check_exists "$archive_file" "$@"
 
-	rm -f /tmp/expected.txt
+	rm -f "$expected"
 
 	remove_sandboxes
 }
@@ -362,17 +370,17 @@ test_i_option() {
 
 	sed 's/\(Symbolic Link \|\r\)\([A-Za-z0-9]*\/\)*/\1/g' \
 	      < "$test_base/output/$archive_file-e.txt"   \
-	      > /tmp/expected.txt
+	      > "$expected"
 
-	lha_check_output /tmp/expected.txt \
+	lha_check_output "$expected" \
 	                 ei $(test_arc_file "$archive_file")
 
 	for filename in "$@"; do
 		local base_filename=$(basename "$filename")
 		check_exists "$archive_file" "$base_filename"
 	done
 
-	rm -f /tmp/expected.txt
+	rm -f "$expected"
 	remove_sandboxes
 }