=========================================== GNU patch 2.7.3: tests/test-suite.log =========================================== # TOTAL: 36 # PASS: 33 # SKIP: 0 # XFAIL: 1 # FAIL: 2 # XPASS: 0 # ERROR: 0 .. contents:: :depth: 2 FAIL: crlf-handling =================== * patch c < ab.diff FAILED --- expected +++ got @@ -1,2 +1 @@ -(Stripping trailing CRs from patch; use --binary to disable.) -patching file c +/data/prj/gnu/patch/patch-2.7.3/src/patch: **** Only garbage was found in the patch input. * patch c < ab.diff FAILED --- expected +++ got @@ -1,2 +1 @@ -(Stripping trailing CRs from patch; use --binary to disable.) -patching file c +/data/prj/gnu/patch/patch-2.7.3/src/patch: **** Only garbage was found in the patch input. * patch c < ab.diff FAILED --- expected +++ got @@ -1,2 +1 @@ -(Stripping trailing CRs from patch; use --binary to disable.) -patching file c +/data/prj/gnu/patch/patch-2.7.3/src/patch: **** Only garbage was found in the patch input. * patch c < ab.ed ok * patch c < ab.diff ok * cat -ve c FAILED --- expected +++ got @@ -1 +1 @@ -1b^M$ +-e 1b^M$ * patch c < ab.diff ok * cat -ve c FAILED --- expected +++ got @@ -1 +1 @@ -1b^M$ +-e 1b^M$ * patch c < ab.diff ok * cat -ve c FAILED --- expected +++ got @@ -1 +1 @@ -1b^M$ +-e 1b^M$ * patch c < ab.diff ok * cat -ve c FAILED --- expected +++ got @@ -1 +1 @@ -1b^M$ +-e 1b^M$ * patch --binary c < ab.diff || echo status: $? FAILED --- expected +++ got @@ -1,4 +1,2 @@ -patching file c -Hunk #1 FAILED at 1 (different line endings). -1 out of 1 hunk FAILED -- saving rejects to file c.rej -status: 1 +/data/prj/gnu/patch/patch-2.7.3/src/patch: **** Only garbage was found in the patch input. +status: 2 * patch c < ab.diff FAILED --- expected +++ got @@ -1,2 +1 @@ -(Stripping trailing CRs from patch; use --binary to disable.) -patching file c +/data/prj/gnu/patch/patch-2.7.3/src/patch: **** Only garbage was found in the patch input. * cat -ve c FAILED --- expected +++ got @@ -1 +1 @@ -1b$ +1$ * patch --binary c < ab.diff FAILED --- expected +++ got @@ -1 +1 @@ -patching file c +/data/prj/gnu/patch/patch-2.7.3/src/patch: **** Only garbage was found in the patch input. * cat -ve c FAILED --- expected +++ got @@ -1 +1 @@ -1b^M$ +-e 1^M$ * patch c < ab.diff FAILED --- expected +++ got @@ -1,2 +1 @@ -(Stripping trailing CRs from patch; use --binary to disable.) -patching file c +/data/prj/gnu/patch/patch-2.7.3/src/patch: **** Only garbage was found in the patch input. * cat -ve c FAILED --- expected +++ got @@ -1 +1 @@ -1b$ +1$ * patch --binary c < ab.diff FAILED --- expected +++ got @@ -1 +1 @@ -patching file c +/data/prj/gnu/patch/patch-2.7.3/src/patch: **** Only garbage was found in the patch input. * cat -ve c FAILED --- expected +++ got @@ -1 +1 @@ -1b^M$ +-e 1^M$ * patch c < ab.diff FAILED --- expected +++ got @@ -1,2 +1 @@ -(Stripping trailing CRs from patch; use --binary to disable.) -patching file c +/data/prj/gnu/patch/patch-2.7.3/src/patch: **** Only garbage was found in the patch input. * cat -ve c FAILED --- expected +++ got @@ -1 +1 @@ -1b$ +1$ * patch --binary c < ab.diff FAILED --- expected +++ got @@ -1 +1 @@ -patching file c +/data/prj/gnu/patch/patch-2.7.3/src/patch: **** Only garbage was found in the patch input. * cat -ve c FAILED --- expected +++ got @@ -1 +1 @@ -1b^M$ +-e 1^M$ * patch c < ab.diff ok * cat -ve c ok 27 tests (7 passed, 20 failed) XFAIL: dash-o-append ==================== * patch -o a.new a < a.diff FAILED --- expected +++ got @@ -1,2 +1,4 @@ patching file a.new (read from a) patching file a.new (read from a) +Hunk #1 FAILED at 1. +1 out of 1 hunk FAILED -- saving rejects to file a.new.rej * cat a.new FAILED --- expected +++ got @@ -1,2 +1,2 @@ two -three +one 2 tests (0 passed, 2 failed) FAIL: merge =========== * x 3 FAILED --- expected +++ got @@ -1,7 +1 @@ -1 -2 -3 - -1 -2 -3 +./merge[9]: shift: bad number * x 3 2d FAILED --- expected +++ got @@ -1,5 +1 @@ -1 -3 - -1 -3 +./merge[9]: shift: bad number * x 2 2i\ b FAILED --- expected +++ got @@ -1,7 +1 @@ -1 -b -2 - -1 -b -2 +./merge[9]: shift: bad number * x 3 2i\ b -- 3i\ c ok * x 3 2c\ 2b -- 2c\ 2c ok * x 3 2d -- 2d ok * x 2 2i\ bc -- 2i\ bc ok * x 4 2a\ a 2a\ a -- 2a\ a 2a\ a ok * x 2 1i\ a 1i\ b -- 1i\ a 1i\ b ok * x 2 2a\ a 2a\ b -- 2a\ a 2a\ b ok * x 4 2d -- 3d ok * x 4 3d -- 2d ok * x 3 3i\ b -- 2d ok * x 3 2d -- 3i\ b ok * x 1 1c\ b -- 1c\ c ok * x 4 2c\ a 3c\ b -- 2c\ a 3c\ c ok * x 6 3c\ 3b 4c\ 4b -- 3c\ 3c 4c\ 4c ok * x 4 2c\ b 3c\ a -- 2c\ c 3c\ a ok * x 3 2i\ b 3i\ b -- 2i\ c ok * x 3 2i\ b 3i\ b 3i\ b -- 2i\ c ok * x 9 4c\ a 5c\ b 6c\ a -- 4c\ a 5c\ c 6c\ a ok * x 3 2i\ b 3i\ b -- 1i\ 0 ok * x 4 2i\ b 4i\ b -- 1i\ 0 3i\ c ok * x 5 2,4d -- 3c\ 3c ok * x 5 3c\ 3c -- 2,4d ok * x 3 1,2d -- 2i\ c ok * x 3 2i\ c -- 1,2d ok 27 tests (24 passed, 3 failed)