X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fcli%2Ftest_convert_args;h=0afe79ad4f2caf32d6317a8632d951d82ab98bf8;hb=8f902cd7374a0307068de574aa21ba393d88ddfe;hp=6deecf7f079777ff757de5cc0af2099f96f9ac30;hpb=a10401878a467293f1e129b1bb9490ab99eefb2c;p=babeltrace.git

diff --git a/tests/cli/test_convert_args b/tests/cli/test_convert_args
index 6deecf7f..0afe79ad 100755
--- a/tests/cli/test_convert_args
+++ b/tests/cli/test_convert_args
@@ -77,13 +77,17 @@ comment() {
 	echo "### $1 ###"
 }
 
+path_to_trace="${BT_CTF_TRACES_PATH}/succeed/succeed1"
+path_to_trace2="${BT_CTF_TRACES_PATH}/succeed/succeed2"
+output_path="/output/path"
+
 if [ "$BT_OS_TYPE" = "mingw" ]; then
-	path_to_trace="C://path/to/trace"
-	output_path="C://output/path"
-else
-	path_to_trace=$(readlink -f "${BT_CTF_TRACES_PATH}/succeed/succeed1")
-	path_to_trace2=$(readlink -f "${BT_CTF_TRACES_PATH}/succeed/succeed2")
-	output_path="/output/path"
+	# Use Windows native paths for comparison because Unix
+	# paths are converted by the shell before they are passed
+	# to the native babeltrace2 binary.
+	path_to_trace=$(cygpath -m "$path_to_trace")
+	path_to_trace2=$(cygpath -m "$path_to_trace2")
+	output_path=$(cygpath -m "$output_path")
 fi
 
 plan_tests 77