From b758575226de75e210bd9385c748732ca62bb877 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Mon, 24 Feb 2014 15:51:49 +0000 Subject: Fix baserock-system-config-sync tests. Wasn't working as expected. --- tests/run_tests.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tests/run_tests.sh b/tests/run_tests.sh index 36dff01..102aea6 100755 --- a/tests/run_tests.sh +++ b/tests/run_tests.sh @@ -25,11 +25,8 @@ compare_dirs() { (cd "$1" && busybox find * -exec busybox stat -c '%n %a' {} + | sort) > "$file1" (cd "$2" && busybox find * -exec busybox stat -c '%n %a' {} + | sort) > "$file2" - # Compare file contents - diff -r "$1" "$2" - - # Compare permissions - diff "$file1" "$file2" + # Compare file contents then permissions + diff -r "$1" "$2" && diff "$file1" "$file2" ) local ret="$?" -- cgit v1.2.1