Commit Graph

68 Commits

Author SHA1 Message Date
ngie
92100036c8 Merge ^/user/ngie/release-pkg-fix-tests to unbreak how test files are installed
after r298107

Summary of changes:

- Replace all instances of FILES/TESTS with ${PACKAGE}FILES. This ensures that
  namespacing is kept with FILES appropriately, and that this shouldn't need
  to be repeated if the namespace changes -- only the definition of PACKAGE
  needs to be changed
- Allow PACKAGE to be overridden by callers instead of forcing it to always be
  `tests`. In the event we get to the point where things can be split up
  enough in the base system, it would make more sense to group the tests
  with the blocks they're a part of, e.g. byacc with byacc-tests, etc
- Remove PACKAGE definitions where possible, i.e. where FILES wasn't used
  previously.
- Remove unnecessary TESTSPACKAGE definitions; this has been elided into
  bsd.tests.mk
- Remove unnecessary BINDIRs used previously with ${PACKAGE}FILES;
  ${PACKAGE}FILESDIR is now automatically defined in bsd.test.mk.
- Fix installation of files under data/ subdirectories in lib/libc/tests/hash
  and lib/libc/tests/net/getaddrinfo
- Remove unnecessary .include <bsd.own.mk>s (some opportunistic cleanup)

Document the proposed changes in share/examples/tests/tests/... via examples
so it's clear that ${PACKAGES}FILES is the suggested way forward in terms of
replacing FILES. share/mk/bsd.README didn't seem like the appropriate method
of communicating that info.

MFC after: never probably
X-MFC with: r298107
PR: 209114
Relnotes: yes
Tested with: buildworld, installworld, checkworld; buildworld, packageworld
Sponsored by: EMC / Isilon Storage Division
2016-05-04 23:20:53 +00:00
gjb
1c7e318a9a MFH
Sponsored by:	The FreeBSD Foundation
2016-03-10 21:16:01 +00:00
bdrewery
aab40fdc3d DIRDEPS_BUILD: Connect MK_TESTS.
Sponsored by:	EMC / Isilon Storage Division
2016-03-09 22:46:01 +00:00
gjb
ae6f203603 More 'tests' packaging fixes.
Sponsored by:	The FreeBSD Foundation
2016-02-03 19:08:45 +00:00
bdrewery
fe1ef27d4a META MODE: Update dependencies with 'the-lot' and add missing directories.
This is not properly respecting WITHOUT or ARCH dependencies in target/.
Doing so requires a massive effort to rework targets/ to do so.  A
better approach will be to either include the SUBDIR Makefiles directly
and map to DIRDEPS or just dynamically lookup the SUBDIR.  These lose
the benefit of having a userland/lib, userland/libexec, etc, though and
results in a massive package.  The current implementation of targets/ is
very unmaintainable.

Currently rescue/rescue and sys/modules are still not connected.

Sponsored by:	EMC / Isilon Storage Division
2015-12-01 05:23:19 +00:00
ngie
dd1f618367 Refactor the test/ Makefiles after recent changes to bsd.test.mk (r289158) and
netbsd-tests.test.mk (r289151)

- Eliminate explicit OBJTOP/SRCTOP setting
- Convert all ad hoc NetBSD test integration over to netbsd-tests.test.mk
- Remove unnecessary TESTSDIR setting
- Use SRCTOP where possible for clarity

MFC after: 2 weeks
Sponsored by: EMC / Isilon Storage Divison
2015-10-12 08:16:03 +00:00
bdrewery
459799dc3d META_MODE: Remove DEP_MACHINE from Makefile.depend files.
This has not been needed since r246865 in projects/bmake.

Sponsored by:	EMC / Isilon Storage Division
2015-09-25 19:44:01 +00:00
bdrewery
f37faa57f7 META_MODE: Remove DEP_RELDIR from Makefile.depend files.
This has not been needed since r284171 in projects/bmake.

Sponsored by:	EMC / Isilon Storage Division
2015-09-25 19:26:08 +00:00
sjg
008d7c831f Add META_MODE support.
Off by default, build behaves normally.
WITH_META_MODE we get auto objdir creation, the ability to
start build from anywhere in the tree.

Still need to add real targets under targets/ to build packages.

Differential Revision:       D2796
Reviewed by: brooks imp
2015-06-13 19:20:56 +00:00
sjg
65145fa4c8 Merge sync of head 2015-05-27 01:19:58 +00:00
bapt
f4d100725d Install old texinfo pages in the form of mdoc(7) pages 2015-03-02 11:49:01 +00:00
ngie
173f714d97 Remove gnu/ info pages to unbreak the build with MK_GCC != no, etc
Reported by: Ivan Klymenko <fidaj@ukr.net>
Reviewed by: bapt
Differential Revision: D1412
2015-01-02 20:34:55 +00:00
bapt
1f18779318 Convert to LIBADD
Reduce overlinking
2014-11-25 21:18:18 +00:00
sjg
b137080f19 Merge from head@274682 2014-11-19 01:07:58 +00:00
ngie
af608f76fa Integrate usr.bin/diff/tests from NetBSD into atf/kyua at gnu/usr.bin/diff/tests
Sponsored by: EMC / Isilon Storage Division
2014-10-09 02:07:34 +00:00
sjg
62bb106222 Merge from head 2013-09-05 20:18:59 +00:00
jkim
9ac6b25878 Adjust CFLAGS to pick up correct regex.h and posix/regex.h. Note this
actually reverts r250860 and r250861.

Reported by:	gjb, tinderbox
2013-06-06 11:59:38 +00:00
jkim
38367105c6 Connect libgnuregex 2.17 to the build. 2013-06-05 21:31:06 +00:00
marcel
08ee50ef4a Don't look for headers outside of the source or object directories. In
particular, don't use DESTDIR. Such creates an unnecessary dependency
on the build machine.

Obtained from:	Juniper Networks, Inc.
2013-05-21 17:28:19 +00:00
sjg
778e93c51a Sync from head 2012-11-04 02:52:03 +00:00
marcel
9dd41e3647 Sync FreeBSD's bmake branch with Juniper's internal bmake branch.
Requested by: Simon Gerraty <sjg@juniper.net>
2012-08-22 19:25:57 +00:00
obrien
a941b72fdc Catch up with the subversion conversion and apply these build-time patches. 2012-08-17 18:20:38 +00:00
ed
543b5e901b Change all our own code to use st_*tim instead of st_*timespec.
Also remove some local patches to diff(1) which are now unneeded.
2010-03-28 13:16:08 +00:00
delphij
60522dd811 POSIX patch(1) would treat -b as different meaning (the functionality
is to be provided by --suffix).  Looking at the usage here in diffutils,
it seems that we can just get rid of the -b .orig stuff.  This resolves
a problem that can triggered if we move toward to a more permissively
licensed patch(1) program.
2010-02-22 22:32:24 +00:00
obrien
5847d42878 style.Makefile(5) 2007-10-12 18:03:00 +00:00
delphij
6a4276ae14 Fix build on arm: time_t on arm is 64 bits while long is
32 bits, so subsequent compile time assertion:

	sizeof inf->stat.st_mtime <= sizeof sec

Would fail because of that.  This change is suitable for
general consumption as well, but fix it in our local
patchset as we are near a code freeze.

Submitted by:	cognet
2007-06-17 00:43:50 +00:00
delphij
33aeb00c4d Update build skeleton after diffutils 2.8.7 update. 2007-06-15 07:09:34 +00:00
delphij
c4f51b4051 Suggest the user to use 'diff -urN' instead of 'diff -crN'.
Submitted by:	Jimmie James  <jimmiejaz@gmail.com>
PR:		docs/88427
2005-11-03 03:49:57 +00:00
ache
2bf5bfe61f Oops, use -I${DESTDIR}/usr/include/gnu instead of ... /../../include/gnu 2004-02-17 05:38:45 +00:00
ache
d034a2d7ec Remove files no longer needed
Switch back to regex.h
2004-02-16 22:56:36 +00:00
ru
743cc6d002 Fixed style of DPADD and LDADD assignments as per style.Makefile(5). 2004-02-05 22:44:25 +00:00
ceri
b5ad8f097f Add a section documenting the return values from diff.
PR:		docs/59991
Submitted by:	keramida,Erik Greenwald <erik@smluc.org>
MFC After:	1 week
2004-02-01 13:52:19 +00:00
keramida
3423ef22d8 Document -p option of diff.
PR:		docs/41887
Submitted by:	tobez
2002-08-26 00:13:06 +00:00
keramida
eea24f3d3e Add note about the info documentation of diff(1).
It contains a detailed description of the =format option part.

PR:		docs/36464
Submitted by:	Gary W. Swearingen <swear@blarg.net>
2002-07-11 21:11:26 +00:00
phk
8efde88e33 s/dir.h/dir.c/ 1999-11-26 12:29:48 +00:00
obrien
f6909a6280 Style changes -- whitespace and sorting. 1999-11-26 03:06:33 +00:00
obrien
46689ca7f0 * Support the environtmental var "DIFF_OPTIONS". Which can hold a set of
default options for diff.  These options are interpreted first and can be
overwritten by explicit command line parameters.
* Add the "-o" option to specify old-traditional output style.
* Add utility functions for env vars obtained from GNU Grep 2.3h.
1999-11-26 02:51:44 +00:00
peter
289c0d262f $Id$ -> $FreeBSD$ 1999-08-27 23:37:10 +00:00
obrien
7263583ccb Clarify that "-w" ignores horizontal white space changes. 1999-08-01 16:07:09 +00:00
sheldonh
cef6367707 Add an example for folks who can never remember how to generate a
recursive diff for use with send-pr(1).

PR:	12440
Requested by:	David Kelly <dkelly@hiwaay.net>
1999-07-29 18:57:39 +00:00
ache
45d91efdec Define PR_PROGRAM properly 1997-10-29 17:35:54 +00:00
ache
b1e567feab Switch to contrib version 1997-10-29 16:36:57 +00:00
ache
1252945e3a Add (unsigned char) cast to ctype macros 1997-10-23 02:22:51 +00:00
peter
245ba20d12 Revert $FreeBSD$ to $Id$ 1997-02-22 15:48:31 +00:00
jkh
808a36ef65 Make the long-awaited change from $Id$ to $FreeBSD$
This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore.  This update would have been
insane otherwise.
1997-01-14 07:20:47 +00:00
peter
cff7a604f0 Make this (hopefully) build now. There was no dir entry. 1997-01-12 07:18:05 +00:00
ache
981ea6eb0f Pick collate info fo ranges 1996-08-20 14:22:57 +00:00
jkh
a374210e63 There's no -p flag to our diff. 1996-05-26 22:27:52 +00:00
jkh
f6c941c509 Fix some argument ordering and redundancy bogons. 1996-05-26 21:56:24 +00:00
mpp
93959e6d0e Correct the path used to invoke "pr" if the "-l" option to diff is
specified.  Also invoke "pr" with "-F" instead of the invalid "-f"
option.

Obtained from:  NetBSD-bugs mailing list (PR# 1896)
1996-01-10 10:41:47 +00:00