aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2018-06-28 16:57:21 -0700
committerRob Landley <rob@landley.net>2018-07-04 14:24:24 -0500
commit4d673c9ad4c65c329a85ebb19c2812ae93183099 (patch)
tree0dba43542152b2f06805340104bf25390193cf51 /tests
parent7771e94e2a082726142387476937d7f136f65147 (diff)
downloadtoybox-4d673c9ad4c65c329a85ebb19c2812ae93183099.tar.gz
diff: add timestamps to the ---/+++ lines and --color.
(My apologies for mixing these two unrelated changes up.)
Diffstat (limited to 'tests')
-rwxr-xr-xtests/diff.test8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/diff.test b/tests/diff.test
index ca0b682b..ce51f1e8 100755
--- a/tests/diff.test
+++ b/tests/diff.test
@@ -5,8 +5,8 @@
seq 10 > left
seq 11 > right
-expected='--- left
-+++ right
+expected='--- lll
++++ rrr
@@ -8,3 +8,4 @@
8
9
@@ -14,7 +14,7 @@ expected='--- left
+11
'
# Hm this only gives unified diffs?
-testing "simple" "diff left right" "$expected" "" ""
+testing "simple" "diff -L lll -L rrr left right" "$expected" "" ""
expected='--- tree1/file
@@ -27,4 +27,4 @@ mkdir -p tree1 tree2
echo foo > tree1/file
echo food > tree2/file
-testing "simple" "diff -r tree1 tree2 |tee out" "$expected" "" ""
+testing "simple" "diff -r -L tree1/file -L tree2/file tree1 tree2 |tee out" "$expected" "" ""