diff test/test-layer-exports.sh @ 2499:048d9eed0a1f

Small subrepo fixes, and update tests following fixes to the QM plugin used for the tests

--- a/test/test-layer-exports.sh	Thu Apr 09 15:00:22 2020 +0100
+++ b/test/test-layer-exports.sh	Thu Apr 09 15:00:52 2020 +0100
@@ -144,7 +144,7 @@
                 echo "Test failed for layer type \"$type\"!"
             else
                 echo "Test failed for selected regions in layer type \"$type\"!"
-            fi            
+            fi
             echo
             echo "Actual:"
             ls -l "$actual"
@@ -152,7 +152,7 @@
             ls -l "$expected"
             echo
             echo "Diff begins:"
-            diff -u1 "$actual" "$expected" | head 
+            git diff --no-index --word-diff=color --word-diff-regex=. "$actual" "$expected" | head
             echo
         fi
     done
@@ -171,7 +171,7 @@
         ls -l "$expected"
         echo
         echo "Diff begins:"
-        diff -u1 "$actual" "$expected" | head 
+        git diff --no-index --word-diff=color --word-diff-regex=. "$actual" "$expected" | head
         echo
     fi
 done
@@ -194,7 +194,7 @@
         od -c "$expected" > "$tmpdir/expected-$other".txt
         echo
         echo "Diff:"
-        diff -u1 "$actual".txt "$tmpdir/expected-$other".txt
+        git diff --no-index --word-diff=color --word-diff-regex=. "$actual".txt "expected-$other".txt | head
         echo
     fi
 done