瀏覽代碼

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 年之前
父節點
當前提交
719e24be23

+ 1
- 0
tests/README 查看文件

@@ -4,3 +4,4 @@
4 4
 ../../cdiff.py -c always < in.diff > out.normal
5 5
 ../../cdiff.py -c always -s < in.diff > out.side-by-side
6 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 查看文件

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

+ 1
- 1
tests/crlf/out.normal 查看文件

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

+ 1
- 1
tests/diff-ru-bin/out.normal 查看文件

@@ -18,4 +18,4 @@
18 18
 -Hello
19 19
 +hella
20 20
  world
21
-
21
+

+ 1
- 1
tests/diff-ru/out.normal 查看文件

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

+ 1
- 1
tests/git-bin/out.normal 查看文件

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

+ 1
- 1
tests/git-log/out.normal 查看文件

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

+ 1
- 1
tests/git-perm/out.normal 查看文件

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

+ 1
- 1
tests/git-perm/out.side-by-side 查看文件

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

+ 1
- 1
tests/git-perm/out.w70 查看文件

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

+ 1
- 1
tests/git/out.normal 查看文件

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

+ 1
- 1
tests/hg-log/out.normal 查看文件

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

+ 1
- 1
tests/latin1/out.normal 查看文件

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

+ 2
- 2
tests/regression.sh 查看文件

@@ -33,9 +33,9 @@ function cmp_output()
33 33
     local cdiff_opt=${3:-""}
34 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 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 39
         pass
40 40
         return 0
41 41
     else

+ 1
- 1
tests/strange/out.normal 查看文件

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

+ 1
- 1
tests/svn-log/out.normal 查看文件

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

+ 1
- 1
tests/svn-merge/out.normal 查看文件

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

+ 1
- 1
tests/svn-merge/out.side-by-side 查看文件

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

+ 1
- 1
tests/svn-merge/out.w70 查看文件

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

+ 1
- 1
tests/svn-property/out.normal 查看文件

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

+ 1
- 1
tests/svn-property/out.side-by-side 查看文件

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

+ 1
- 1
tests/svn-property/out.w70 查看文件

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

+ 1
- 1
tests/svn/out.normal 查看文件

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