From d3b089fcb170c214be31e4869cd16a149c6b9dd1 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 1 Aug 2011 15:13:08 +0100 Subject: [PATCH 1/1] virt-tar test: Stable ordering of test output. The files could be listed in any order, resulting in the test failing for no reason. Sort the output of tar. (cherry picked from commit 995b3fecb9af7a8bd52b238bad2a631a1193c83a) --- tools/test-virt-tar.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/test-virt-tar.sh b/tools/test-virt-tar.sh index 2239c13..dec4f48 100755 --- a/tools/test-virt-tar.sh +++ b/tools/test-virt-tar.sh @@ -6,7 +6,7 @@ set -e # Read out the test directory using virt-tar. ./virt-tar -x ../images/fedora.img /bin test.tar -if [ "$(tar tf test.tar)" != "./ +if [ "$(tar tf test.tar | sort)" != "./ ./ls ./test1 ./test2 -- 1.8.3.1