netvor
/
ydiff
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 23 Wiki Activity
Browse Source

Update test data with missing EOL. 

For some cases missing EOL is expected, but diff -b will ignore EOL
difference, use cmp instead.
Matt Wang 6 years ago
parent
22793881dc
commit
719e24be23
23 changed files with 24 additions and 23 deletions
Unified View Show Diff Stats
  1. 1
    0
      tests/README
  2. 1
    1
      tests/context/out.normal
  3. 1
    1
      tests/crlf/out.normal
  4. 1
    1
      tests/diff-ru-bin/out.normal
  5. 1
    1
      tests/diff-ru/out.normal
  6. 1
    1
      tests/git-bin/out.normal
  7. 1
    1
      tests/git-log/out.normal
  8. 1
    1
      tests/git-perm/out.normal
  9. 1
    1
      tests/git-perm/out.side-by-side
  10. 1
    1
      tests/git-perm/out.w70
  11. 1
    1
      tests/git/out.normal
  12. 1
    1
      tests/hg-log/out.normal
  13. 1
    1
      tests/latin1/out.normal
  14. 2
    2
      tests/regression.sh
  15. 1
    1
      tests/strange/out.normal
  16. 1
    1
      tests/svn-log/out.normal
  17. 1
    1
      tests/svn-merge/out.normal
  18. 1
    1
      tests/svn-merge/out.side-by-side
  19. 1
    1
      tests/svn-merge/out.w70
  20. 1
    1
      tests/svn-property/out.normal
  21. 1
    1
      tests/svn-property/out.side-by-side
  22. 1
    1
      tests/svn-property/out.w70
  23. 1
    1
      tests/svn/out.normal

+ 1
- 0
tests/README View File

4 
 ../../cdiff.py -c always < in.diff > out.normal
 4 
 ../../cdiff.py -c always < in.diff > out.normal
5 
 ../../cdiff.py -c always -s < in.diff > out.side-by-side
 5 
 ../../cdiff.py -c always -s < in.diff > out.side-by-side
6 
 ../../cdiff.py -c always -s < in.diff -w70 > out.w70
 6 
 ../../cdiff.py -c always -s < in.diff -w70 > out.w70
7 
+../../cdiff.py -c always -s < in.diff -w70 --wrap > out.w70.wrap

+ 1
- 1
tests/context/out.normal View File

36 
 
36 
 
37 
      # DOM Level 3 (WD 9 April 2002)
 37 
      # DOM Level 3 (WD 9 April 2002)
38 
 
38 
 
39 
-
39 
+

+ 1
- 1
tests/crlf/out.normal View File

28 
      -y, --yes             do not prompt for overwriting
28 
      -y, --yes             do not prompt for overwriting
29 
 +
29 
 +
30 
 +# EOF
30 
 +# EOF
31 
-
31 
+

+ 1
- 1
tests/diff-ru-bin/out.normal View File

18 
 -Hello
 18 
 -Hello
19 
 +hella
 19 
 +hella
20 
  world
 20 
  world
21 
-
21 
+

+ 1
- 1
tests/diff-ru/out.normal View File

20 
 +world
 20 
 +world
21 
 Only in b: date.txt
 21 
 Only in b: date.txt
22 
 Only in a: time.txt
 22 
 Only in a: time.txt
23 
-
23 
+

+ 1
- 1
tests/git-bin/out.normal View File

24 
 diff --git a/foo.pdf b/foo.pdf
 24 
 diff --git a/foo.pdf b/foo.pdf
25 
 index 0e90017..3c3b90d 100644
 25 
 index 0e90017..3c3b90d 100644
26 
 Binary files a/foo.pdf and b/foo.pdf differ
 26 
 Binary files a/foo.pdf and b/foo.pdf differ
27 
-
27 
+

+ 1
- 1
tests/git-log/out.normal View File

35 
      """
 35 
      """
36 
      # Set up option parser
 36 
      # Set up option parser
37 
      parser = optparse.OptionParser(usage="modernize [options] file|dir ...")
 37 
      parser = optparse.OptionParser(usage="modernize [options] file|dir ...")
38 
-
38 
+

+ 1
- 1
tests/git-perm/out.normal View File

4 
 diff --git a/cdiff.py b/cdiff.py
 4 
 diff --git a/cdiff.py b/cdiff.py
5 
 old mode 100755
 5 
 old mode 100755
6 
 new mode 100644
 6 
 new mode 100644
7 
-
7 
+

+ 1
- 1
tests/git-perm/out.side-by-side View File

4 
 diff --git a/cdiff.py b/cdiff.py
 4 
 diff --git a/cdiff.py b/cdiff.py
5 
 old mode 100755
 5 
 old mode 100755
6 
 new mode 100644
 6 
 new mode 100644
7 
-
7 
+

+ 1
- 1
tests/git-perm/out.w70 View File

4 
 diff --git a/cdiff.py b/cdiff.py
 4 
 diff --git a/cdiff.py b/cdiff.py
5 
 old mode 100755
 5 
 old mode 100755
6 
 new mode 100644
 6 
 new mode 100644
7 
-
7 
+

+ 1
- 1
tests/git/out.normal View File

45 
      if len(args) >= 1:
 45 
      if len(args) >= 1:
46 
          diff_hdl = open(args[0], 'r')
 46 
          diff_hdl = open(args[0], 'r')
47 
      elif sys.stdin.isatty():
 47 
      elif sys.stdin.isatty():
48 
-
48 
+

+ 1
- 1
tests/hg-log/out.normal View File

51 
 
51 
 
52 
      # DOM Level 3 (WD 9 April 2002)
 52 
      # DOM Level 3 (WD 9 April 2002)
53 
 
53 
 
54 
-
54 
+

+ 1
- 1
tests/latin1/out.normal View File

7 
  int latin1()
7 
  int latin1()
8 
  {
8 
  {
9 
  	static int x;
9 
  	static int x;
10 
-
10 
+

+ 2
- 2
tests/regression.sh View File

33 
     local cdiff_opt=${3:-""}
 33 
     local cdiff_opt=${3:-""}
34 
     local cmd
 34 
     local cmd
35
35
36 
-    cmd=$(printf "%-8s $CDIFF %-24s <  %-30s " $PYTHON "$cdiff_opt" "$input")
36 
+    cmd=$(printf "%-7s $CDIFF %-24s < %-30s " $PYTHON "$cdiff_opt" "$input")
37 
     printf "$cmd"
 37 
     printf "$cmd"
38 
-    if eval $cmd 2>/dev/null | diff -ubq $expected_out - >& /dev/null; then
38 
+    if eval $cmd 2>/dev/null | cmp --silent $expected_out -; then
39 
         pass
 39 
         pass
40 
         return 0
 40 
         return 0
41 
     else
 41 
     else

+ 1
- 1
tests/strange/out.normal View File

18 
 @@ -1 +1,2 @@
 18 
 @@ -1 +1,2 @@
19 
  Sun Feb  3 13:57:05 CST 2013
 19 
  Sun Feb  3 13:57:05 CST 2013
20 
 +Sun Feb  3 13:57:15 CST 2013
 20 
 +Sun Feb  3 13:57:15 CST 2013
21 
-
21 
+

+ 1
- 1
tests/svn-log/out.normal View File

49 
 Added: svn:keywords
 49 
 Added: svn:keywords
50 
 ## -0,0 +1 ##
 50 
 ## -0,0 +1 ##
51 
 +Id
 51 
 +Id
52 
-
52 
+

+ 1
- 1
tests/svn-merge/out.normal View File

8 
 Modified: svn:mergeinfo
 8 
 Modified: svn:mergeinfo
9 
    Merged /repository/foo/branches/foo-bar:r4-9
 9 
    Merged /repository/foo/branches/foo-bar:r4-9
10 
    Merged /repository/foo/trunk/foo:r2-3
 10 
    Merged /repository/foo/trunk/foo:r2-3
11 
-
11 
+

+ 1
- 1
tests/svn-merge/out.side-by-side View File

8 
 Modified: svn:mergeinfo
 8 
 Modified: svn:mergeinfo
9 
    Merged /repository/foo/branches/foo-bar:r4-9
 9 
    Merged /repository/foo/branches/foo-bar:r4-9
10 
    Merged /repository/foo/trunk/foo:r2-3
 10 
    Merged /repository/foo/trunk/foo:r2-3
11 
-
11 
+

+ 1
- 1
tests/svn-merge/out.w70 View File

8 
 Modified: svn:mergeinfo
 8 
 Modified: svn:mergeinfo
9 
    Merged /repository/foo/branches/foo-bar:r4-9
 9 
    Merged /repository/foo/branches/foo-bar:r4-9
10 
    Merged /repository/foo/trunk/foo:r2-3
 10 
    Merged /repository/foo/trunk/foo:r2-3
11 
-
11 
+

+ 1
- 1
tests/svn-property/out.normal View File

2 
 ===================================================================
 2 
 ===================================================================
3 
 Cannot display: file marked as a binary type.
 3 
 Cannot display: file marked as a binary type.
4 
 svn:mime-type = application/octet-stream
 4 
 svn:mime-type = application/octet-stream
5 
-
5 
+

+ 1
- 1
tests/svn-property/out.side-by-side View File

2 
 ===================================================================
 2 
 ===================================================================
3 
 Cannot display: file marked as a binary type.
 3 
 Cannot display: file marked as a binary type.
4 
 svn:mime-type = application/octet-stream
 4 
 svn:mime-type = application/octet-stream
5 
-
5 
+

+ 1
- 1
tests/svn-property/out.w70 View File

2 
 ===================================================================
 2 
 ===================================================================
3 
 Cannot display: file marked as a binary type.
 3 
 Cannot display: file marked as a binary type.
4 
 svn:mime-type = application/octet-stream
 4 
 svn:mime-type = application/octet-stream
5 
-
5 
+

+ 1
- 1
tests/svn/out.normal View File

28 
      -y, --yes             do not prompt for overwriting
 28 
      -y, --yes             do not prompt for overwriting
29 
 +
 29 
 +
30 
 +# EOF
 30 
 +# EOF
31 
-
31 
+