Module Name: src
Committed By: yamt
Date: Thu May 22 11:37:18 UTC 2014
Modified Files:
src/regress/lib/libc [yamt-pagecache]: Makefile
src/regress/sys/fs/ffs [yamt-pagecache]: Makefile
src/regress/sys/kern/ras/ras1 [yamt-pagecache]: Makefile
src/regress/sys/kern/ras/ras2 [yamt-pagecache]: Makefile
src/regress/sys/kern/ras/ras3 [yamt-pagecache]: Makefile
Log Message:
sync with head.
for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.
this commit was splitted into small chunks to avoid
a limitation of cvs. ("Protocol error: too many arguments")
To generate a diff of this commit:
cvs rdiff -u -r1.80.4.1 -r1.80.4.2 src/regress/lib/libc/Makefile
cvs rdiff -u -r1.6 -r1.6.48.1 src/regress/sys/fs/ffs/Makefile
cvs rdiff -u -r1.5.2.1 -r1.5.2.2 src/regress/sys/kern/ras/ras1/Makefile
cvs rdiff -u -r1.5.2.1 -r1.5.2.2 src/regress/sys/kern/ras/ras2/Makefile
cvs rdiff -u -r1.5.2.1 -r1.5.2.2 src/regress/sys/kern/ras/ras3/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/regress/lib/libc/Makefile
diff -u src/regress/lib/libc/Makefile:1.80.4.1 src/regress/lib/libc/Makefile:1.80.4.2
--- src/regress/lib/libc/Makefile:1.80.4.1 Tue Apr 17 00:05:37 2012
+++ src/regress/lib/libc/Makefile Thu May 22 11:37:18 2014
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.80.4.1 2012/04/17 00:05:37 yamt Exp $
+# $NetBSD: Makefile,v 1.80.4.2 2014/05/22 11:37:18 yamt Exp $
SUBDIR+= citrus divrem
.include <bsd.own.mk>
-.include <bsd.sys.mk>
.if exists(arch/${MACHINE_ARCH})
SUBDIR+= arch/${MACHINE_ARCH}
Index: src/regress/sys/fs/ffs/Makefile
diff -u src/regress/sys/fs/ffs/Makefile:1.6 src/regress/sys/fs/ffs/Makefile:1.6.48.1
--- src/regress/sys/fs/ffs/Makefile:1.6 Wed Jun 30 03:26:27 2004
+++ src/regress/sys/fs/ffs/Makefile Thu May 22 11:37:18 2014
@@ -1,4 +1,4 @@
-## $NetBSD: Makefile,v 1.6 2004/06/30 03:26:27 jmc Exp $
+## $NetBSD: Makefile,v 1.6.48.1 2014/05/22 11:37:18 yamt Exp $
## Notes:
## This set of tests creates a dummy directory tree in /tmp and
## populates it with several files. The test requires around 1100
@@ -15,7 +15,7 @@
##
## This is derived from work done by Brian Grayson, submitted in PR 6706.
-.include <bsd.sys.mk> # for HOST_SH
+.include <bsd.own.mk>
TMPL=/tmp/ffstemplate
TMPMP=/tmp/ffsregresstest_mount
Index: src/regress/sys/kern/ras/ras1/Makefile
diff -u src/regress/sys/kern/ras/ras1/Makefile:1.5.2.1 src/regress/sys/kern/ras/ras1/Makefile:1.5.2.2
--- src/regress/sys/kern/ras/ras1/Makefile:1.5.2.1 Tue Apr 17 00:05:37 2012
+++ src/regress/sys/kern/ras/ras1/Makefile Thu May 22 11:37:18 2014
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.5.2.1 2012/04/17 00:05:37 yamt Exp $
+# $NetBSD: Makefile,v 1.5.2.2 2014/05/22 11:37:18 yamt Exp $
NOMAN= #defined
+.include <bsd.own.mk> # ACTIVE_CC
+
PROG= ras1
-WARNS= 2
regress:
@if ./${PROG} ; then \
Index: src/regress/sys/kern/ras/ras2/Makefile
diff -u src/regress/sys/kern/ras/ras2/Makefile:1.5.2.1 src/regress/sys/kern/ras/ras2/Makefile:1.5.2.2
--- src/regress/sys/kern/ras/ras2/Makefile:1.5.2.1 Tue Apr 17 00:05:37 2012
+++ src/regress/sys/kern/ras/ras2/Makefile Thu May 22 11:37:18 2014
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.5.2.1 2012/04/17 00:05:37 yamt Exp $
+# $NetBSD: Makefile,v 1.5.2.2 2014/05/22 11:37:18 yamt Exp $
NOMAN= #defined
+.include <bsd.own.mk> # ACTIVE_CC
+
PROG= ras2
-WARNS= 2
regress:
@if ./${PROG} ; then \
Index: src/regress/sys/kern/ras/ras3/Makefile
diff -u src/regress/sys/kern/ras/ras3/Makefile:1.5.2.1 src/regress/sys/kern/ras/ras3/Makefile:1.5.2.2
--- src/regress/sys/kern/ras/ras3/Makefile:1.5.2.1 Tue Apr 17 00:05:38 2012
+++ src/regress/sys/kern/ras/ras3/Makefile Thu May 22 11:37:18 2014
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.5.2.1 2012/04/17 00:05:38 yamt Exp $
+# $NetBSD: Makefile,v 1.5.2.2 2014/05/22 11:37:18 yamt Exp $
NOMAN= #defined
+
+.include <bsd.own.mk> # ACTIVE_CC
+
PROG= ras3
-WARNS= 2
regress:
@if ./${PROG} ; then \