summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-02-24 15:51:49 (GMT)
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-02-26 11:49:21 (GMT)
commitb758575226de75e210bd9385c748732ca62bb877 (patch)
tree8717f0f621f02a3eeecea0c64a46312db6b0f6d2
parent5241c54c358da841a6f96ab8099f787186f34521 (diff)
downloadtbdiff-b758575226de75e210bd9385c748732ca62bb877.tar.gz
Fix baserock-system-config-sync tests. Wasn't working as expected.
-rwxr-xr-xtests/run_tests.sh7
1 files 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="$?"