Re: [Gnu-arch-users] [configure] test for diff/diff3

[Ollivier Robert]

According to Tom Lord:
> I'd appreciate some digging in to figure out what's up with these
> systems.

Understood.
 
> Are you guys _certain_ that the diffs-that-fail-the-test are of a
> variety that _do_ add the "no newline" annotation to their output?

----------------------------
revision 1.5
date: 2002/11/25 22:59:52;  author: gad;  state: Exp;  lines: +2 -2
Add back the "\ No newline at end of file" marker that is printed when
comparing two files, where only one file is missing the final newline
character.  This undoes revisions 1.3 and 1.4, returning 'diff' to how
it behaved before July 2000.  We can do this now because our version of
'patch' was modified (just before 4.6-release) to understand what to do
with that line.  This marker is the same one generated by 'diff' under
netbsd, openbsd, darwin, and linux (and any OS with "gnu-diff" installed).

Reviewed by:    imp freebsd-standards (back in april)
Approved by:    re (bmah)
MFC after:      1 week
----------------------------

So yes, I'm sure :)
 
> If so, are these recent GNU diffs or older ones?  What versions?

2.7 with local modifications (as above) but our patch has been patched do deal
with it for the FreeBSD system. Reading "cvs log" leads me to think our diff
is now back at regular behaviour so why tla is tripping over when running with
the system diff?  Maybe the modified patch.

This needs to be investigated. I'll see what I can do.

I think the test is failing because both test files have no newline at the
end. If you read the changelog above, it is supposed to print the warning only
either file misses the newline.

With the following, the test is not failing on FreeBSD. It works with a
pristine GNU diff 2.7 too. Interesting.

M  build-tools/auto-conf-lib/nonl-safe-diff

* modified files

--- orig/build-tools/auto-conf-lib/nonl-safe-diff
+++ mod/build-tools/auto-conf-lib/nonl-safe-diff
@@ -60,7 +60,7 @@
 bla
 EOF
 
-printf "end" >>"$NLEOF_B"
+#printf "end" >>"$NLEOF_B"
 
 cat >"$REGULAR_A" <<EOF
 bla


-- 
Ollivier ROBERT -=- FreeBSD: The Power to Serve! -=- address@hidden
Darwin snuadh.freenix.org Kernel Version 7.0.0: Wed Sep 24 15:48:39 PDT 2003