diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-02-26 11:51:52 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-02-26 11:51:52 +0000 |
| commit | f585763060076fdd5104409554613b9ca110f910 (patch) | |
| tree | a5efde1dda2ad6004d987edbf7f7208173f605f5 /tests | |
| parent | bcfb17b890e74538655695c4f76962b16565f664 (diff) | |
| parent | 087ad206db4ef25eff2c21c3d6e06194f0e217ee (diff) | |
| download | tbdiff-f585763060076fdd5104409554613b9ca110f910.tar.gz | |
Merge branch 'baserock/pedroalvarez/bscs-wrong-merge2'
Reviewed-by: Richard Maw
Diffstat (limited to 'tests')
9 files changed, 18 insertions, 5 deletions
diff --git a/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file8 b/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file8 new file mode 100644 index 0000000..7c1f4fb --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file8 @@ -0,0 +1,2 @@ +whereami=v1,vu,v2 +version=v1 diff --git a/tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file8 b/tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file8 new file mode 100644 index 0000000..24553ad --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file8 @@ -0,0 +1,2 @@ +whereami=v1,vu,v2 +version=vu diff --git a/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file8 b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file8 new file mode 100644 index 0000000..24553ad --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file8 @@ -0,0 +1,2 @@ +whereami=v1,vu,v2 +version=vu diff --git a/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file8 b/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file8 new file mode 100644 index 0000000..24553ad --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file8 @@ -0,0 +1,2 @@ +whereami=v1,vu,v2 +version=vu diff --git a/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file8 b/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file8 new file mode 100644 index 0000000..7c1f4fb --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file8 @@ -0,0 +1,2 @@ +whereami=v1,vu,v2 +version=v1 diff --git a/tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file8 b/tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file8 new file mode 100644 index 0000000..24553ad --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file8 @@ -0,0 +1,2 @@ +whereami=v1,vu,v2 +version=vu diff --git a/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file8 b/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file8 new file mode 100644 index 0000000..24553ad --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file8 @@ -0,0 +1,2 @@ +whereami=v1,vu,v2 +version=vu diff --git a/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file8 b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file8 new file mode 100644 index 0000000..24553ad --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file8 @@ -0,0 +1,2 @@ +whereami=v1,vu,v2 +version=vu 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="$?" |