X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fcli%2Ftest_trace_copy.in;h=c9047460b70df55595708fdfea2d5c06cdbe3d63;hb=86f0fb5572a6a96b815793f7e39901047aac2ba9;hp=36297bfc60d5b526755e66cd918fc01314bc5ea9;hpb=61100ebb68e0add5c415f3e5f252a546401d70a9;p=babeltrace.git

diff --git a/tests/cli/test_trace_copy.in b/tests/cli/test_trace_copy.in
index 36297bfc..c9047460 100644
--- a/tests/cli/test_trace_copy.in
+++ b/tests/cli/test_trace_copy.in
@@ -15,47 +15,65 @@
 # this program; if not, write to the Free Software Foundation, Inc., 51
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-BABELTRACE_BIN=@abs_top_builddir@/cli/babeltrace
+. "@abs_top_builddir@/tests/utils/common.sh"
 
-CTF_TRACES=@abs_top_srcdir@/tests/ctf-traces
+clean_tmp() {
+	rm -rf "${out_path}" "${text_output1}" "${text_output2}"
+}
 
-source @abs_top_srcdir@/tests/utils/tap/tap.sh
-
-SUCCESS_TRACES=(${CTF_TRACES}/succeed/*)
-FAIL_TRACES=(${CTF_TRACES}/fail/*)
+SUCCESS_TRACES=(${BT_CTF_TRACES_PATH}/succeed/*)
 
 # -2 because there is an empty trace that we skip
 NUM_TESTS=$((${#SUCCESS_TRACES[@]} * 3 - 2))
 
 plan_tests $NUM_TESTS
 
-for path in ${SUCCESS_TRACES[@]}; do
-	out_path=$(mktemp -d)
-	text_output1=$(mktemp)
-	text_output2=$(mktemp)
-	trace=$(basename ${path})
+for path in "${SUCCESS_TRACES[@]}"; do
+	out_path="$(mktemp -d)"
+	text_output1="$(mktemp)"
+	text_output2="$(mktemp)"
+	trace="$(basename "${path}")"
+	sort_cmd="cat" # by default do not sort the trace
 
-	$BABELTRACE_BIN ${path} 2>/dev/null >${text_output1}
-	cnt=$(cat ${text_output1} | wc -l)
-	if test $cnt == 0; then
-		ok 0 "Empty trace, nothing to copy"
+	"${BT_BIN}" --no-delta "${path}" 2>/dev/null >"${text_output1}"
+	ret=$?
+	cnt="$(wc -l < "${text_output1}")"
+	if test "$ret" == 0 && test $cnt == 0; then
+		pass "Empty trace ${trace}, nothing to copy"
+		clean_tmp
 		continue
 	fi
 
-	$BABELTRACE_BIN ${path} --component sink.ctf.fs --path ${out_path} >/dev/null 2>&1
+	# If the trace has a timestamp (starts with [), check if there are
+	# duplicate timestamps in the output.
+	# If there are, we have to sort the text output to make sure it is
+	# always the same.
+	head -1 "${text_output1}" | @GREP@ "^\[" >/dev/null
+	if test $? = 0; then
+		uniq_ts_cnt="$(@AWK@ '{ print $1 }' < "${text_output1}" | sort | uniq | wc -l)"
+		# Extract only the timestamp columns and compare the number of
+		# unique lines with the total number of lines to see if there
+		# are duplicate timestamps.
+		if test $cnt != $uniq_ts_cnt; then
+			diag "Trace with non unique timestamps, sorting the output"
+			sort_cmd="sort"
+			tmp="$(mktemp)"
+			sort "${text_output1}" > "$tmp"
+			rm "${text_output1}"
+			text_output1="$tmp"
+		fi
+	fi
+
+	"${BT_BIN}" "${path}" --component sink.ctf.fs --path "${out_path}" >/dev/null 2>&1
 	ok $? "Copy trace ${trace} with ctf-fs sink"
 
-	$BABELTRACE_BIN ${out_path} >/dev/null 2>&1
-	if test $? != 0; then
-		fail "Read the new trace in ${out_path}"
-		continue
-	fi
-	ok 0 "Read the new trace in ${out_path}"
+	"${BT_BIN}" "${out_path}" >/dev/null 2>&1
+	ok $? "Read the new trace in ${out_path}"
 
-	$BABELTRACE_BIN ${out_path} 2>/dev/null >${text_output2}
-	cnt=$(diff ${text_output1} ${text_output2} | wc -l)
-	test $? == 0
+	"${BT_BIN}" --no-delta "${out_path}" 2>/dev/null | $sort_cmd >"${text_output2}"
+	cnt=$(diff "${text_output1}" "${text_output2}" | wc -l)
+	test $cnt == 0
 	ok $? "Exact same content between the two traces"
 
-	rm -rf ${out_path} ${text_output} ${text_output2}
+	clean_tmp
 done