CVS commit: src/external/mit/xorg/server/drivers/xf86-video-openchrome
Module Name:src Committed By: mrg Date: Sun Aug 24 06:13:36 UTC 2014 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-openchrome: Makefile Log Message: fix the sources list to match the upstream Makefile.am. fixes problems reported by jdbaker. XXX: pullup-7. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.5 src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.6 --- src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.5 Sat Jun 1 21:21:36 2013 +++ src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile Sun Aug 24 06:13:36 2014 @@ -1,10 +1,13 @@ -# $NetBSD: Makefile,v 1.5 2013/06/01 21:21:36 mrg Exp $ +# $NetBSD: Makefile,v 1.6 2014/08/24 06:13:36 mrg Exp $ DRIVER= xf86-video-openchrome DRIVER_NAME= openchrome_drv SRCS= \ via_3d.c \ + via_exa.c \ + via_exa_h2.c \ + via_exa_h6.c \ via_bandwidth.c \ via_ch7xxx.c \ via_display.c \ @@ -13,13 +16,19 @@ SRCS= \ via_id.c \ via_lvds.c \ via_memcpy.c \ + via_memmgr.c \ + via_outputs.c \ + via_xv_overlay.c \ + via_ums.c \ via_vbe.c \ via_vgahw.c \ + via_xv.c \ via_vt162x.c # DRI SRCS+= \ via_dri.c \ + via_kms.c \ via_xvmc.c MAN= openchrome.4
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: martin
Date: Sat Aug 23 21:37:56 UTC 2014
Modified Files:
src/sys/dev/usb: umcs.c
Log Message:
Fix a few logical vs. physical port number confusions to make this
driver work with two port variants.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/usb/umcs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/umcs.c
diff -u src/sys/dev/usb/umcs.c:1.7 src/sys/dev/usb/umcs.c:1.8
--- src/sys/dev/usb/umcs.c:1.7 Mon May 5 20:56:15 2014
+++ src/sys/dev/usb/umcs.c Sat Aug 23 21:37:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: umcs.c,v 1.7 2014/05/05 20:56:15 joerg Exp $ */
+/* $NetBSD: umcs.c,v 1.8 2014/08/23 21:37:56 martin Exp $ */
/* $FreeBSD: head/sys/dev/usb/serial/umcs.c 260559 2014-01-12 11:44:28Z hselasky $ */
/*-
@@ -41,7 +41,7 @@
*
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: umcs.c,v 1.7 2014/05/05 20:56:15 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umcs.c,v 1.8 2014/08/23 21:37:56 martin Exp $");
#include
#include
@@ -420,7 +420,8 @@ umcs7840_set_UART_reg(struct umcs7840_so
}
static int
-umcs7840_set_baudrate(struct umcs7840_softc *sc, uint8_t portno, uint32_t rate)
+umcs7840_set_baudrate(struct umcs7840_softc *sc, uint8_t portno,
+ uint32_t rate)
{
int err;
uint16_t divisor;
@@ -434,7 +435,8 @@ umcs7840_set_baudrate(struct umcs7840_so
return (-1);
}
if (divisor == 0 || (clk & MCS7840_DEV_SPx_CLOCK_MASK) != clk) {
- DPRINTF(("Port %d bad speed calculation: %d\n", portno, rate));
+ DPRINTF(("Port %d bad speed calculation: %d\n", portno,
+ rate));
return (-1);
}
DPRINTF(("Port %d set speed: %d (%02x / %d)\n", portno, rate, clk, divisor));
@@ -585,20 +587,19 @@ static void
umcs7840_set(void *self, int portno, int reg, int onoff)
{
struct umcs7840_softc *sc = self;
- int pn = sc->sc_ports[portno].sc_port_phys;
if (sc->sc_dying)
return;
switch (reg) {
case UCOM_SET_DTR:
- umcs7840_dtr(sc, pn, onoff);
+ umcs7840_dtr(sc, portno, onoff);
break;
case UCOM_SET_RTS:
- umcs7840_rts(sc, pn, onoff);
+ umcs7840_rts(sc, portno, onoff);
break;
case UCOM_SET_BREAK:
- umcs7840_break(sc, pn, onoff);
+ umcs7840_break(sc, portno, onoff);
break;
default:
break;
@@ -665,7 +666,7 @@ umcs7840_param(void *self, int portno, s
umcs7840_set_UART_reg(sc, pn, MCS7840_UART_REG_MCR,
sc->sc_ports[pn].sc_port_mcr);
- if (umcs7840_set_baudrate(sc, pn, t->c_ospeed))
+ if (umcs7840_set_baudrate(sc, portno, t->c_ospeed))
return EIO;
return 0;
@@ -804,7 +805,7 @@ umcs7840_port_open(void *self, int portn
return EIO;
/* Set speed 9600 */
- if (umcs7840_set_baudrate(sc, pn, 9600))
+ if (umcs7840_set_baudrate(sc, portno, 9600))
return EIO;
CVS commit: src/sys/arch/i386/conf
Module Name:src
Committed By: dholland
Date: Sat Aug 23 21:10:20 UTC 2014
Modified Files:
src/sys/arch/i386/conf: INSTALL_FLOPPY INSTALL_TINY NET4501
Log Message:
Add missing COMPAT_{50,60,70} lines, commented out or not as per the
COMPAT_40 line.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/i386/conf/INSTALL_FLOPPY
cvs rdiff -u -r1.142 -r1.143 src/sys/arch/i386/conf/INSTALL_TINY
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/i386/conf/NET4501
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/conf/INSTALL_FLOPPY
diff -u src/sys/arch/i386/conf/INSTALL_FLOPPY:1.25 src/sys/arch/i386/conf/INSTALL_FLOPPY:1.26
--- src/sys/arch/i386/conf/INSTALL_FLOPPY:1.25 Sat Aug 23 20:26:58 2014
+++ src/sys/arch/i386/conf/INSTALL_FLOPPY Sat Aug 23 21:10:20 2014
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_FLOPPY,v 1.25 2014/08/23 20:26:58 dholland Exp $
+# $NetBSD: INSTALL_FLOPPY,v 1.26 2014/08/23 21:10:20 dholland Exp $
#
# INSTALL - Installation kernel.
#
@@ -88,8 +88,11 @@ options DDB # in-kernel debugger
#options COMPAT_15 # NetBSD 1.5,
#options COMPAT_16 # NetBSD 1.6,
options COMPAT_20 # NetBSD 2.0,
-options COMPAT_30 # NetBSD 3.0, and
-options COMPAT_40 # NetBSD 4.0 binary compatibility.
+options COMPAT_30 # NetBSD 3.0,
+options COMPAT_40 # NetBSD 4.0,
+options COMPAT_50 # NetBSD 5.0,
+options COMPAT_60 # NetBSD 6.0, and
+options COMPAT_70 # NetBSD 7.0 binary compatibility.
#options COMPAT_43 # 4.3BSD, 386BSD, and BSDI
#options COMPAT_386BSD_MBRPART # recognize old partition ID
#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
Index: src/sys/arch/i386/conf/INSTALL_TINY
diff -u src/sys/arch/i386/conf/INSTALL_TINY:1.142 src/sys/arch/i386/conf/INSTALL_TINY:1.143
--- src/sys/arch/i386/conf/INSTALL_TINY:1.142 Sat Aug 23 20:26:58 2014
+++ src/sys/arch/i386/conf/INSTALL_TINY Sat Aug 23 21:10:20 2014
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_TINY,v 1.142 2014/08/23 20:26:58 dholland Exp $
+# $NetBSD: INSTALL_TINY,v 1.143 2014/08/23 21:10:20 dholland Exp $
#
# This kernel should be derived from INSTALL (which is derived
# from GENERIC) with some features commented out.
@@ -77,8 +77,11 @@ no options EXEC_AOUT # we don't a.out s
#options COMPAT_15 # NetBSD 1.5,
#options COMPAT_16 # NetBSD 1.6,
#options COMPAT_20 # NetBSD 2.0,
-#options COMPAT_30 # NetBSD 3.0, and
-#options COMPAT_40 # NetBSD 4.0 binary compatibility.
+#options COMPAT_30 # NetBSD 3.0,
+#options COMPAT_40 # NetBSD 4.0,
+#options COMPAT_50 # NetBSD 5.0,
+#options COMPAT_60 # NetBSD 6.0, and
+#options COMPAT_70 # NetBSD 7.0 binary compatibility.
#options COMPAT_43 # 4.3BSD, 386BSD, and BSDI compatibility.
#options COMPAT_386BSD_MBRPART # recognize old partition ID
#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
Index: src/sys/arch/i386/conf/NET4501
diff -u src/sys/arch/i386/conf/NET4501:1.86 src/sys/arch/i386/conf/NET4501:1.87
--- src/sys/arch/i386/conf/NET4501:1.86 Sat Aug 23 20:26:58 2014
+++ src/sys/arch/i386/conf/NET4501 Sat Aug 23 21:10:20 2014
@@ -1,4 +1,4 @@
-# $NetBSD: NET4501,v 1.86 2014/08/23 20:26:58 dholland Exp $
+# $NetBSD: NET4501,v 1.87 2014/08/23 21:10:20 dholland Exp $
#
# NET4501 -- kernel configuration for a Soekris Engineering net4501
# single-board computer.
@@ -10,7 +10,7 @@ include "arch/i386/conf/std.i386"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "NET4501-$Revision: 1.86 $"
+#ident "NET4501-$Revision: 1.87 $"
maxusers 32 # estimated number of users
@@ -87,8 +87,11 @@ options COMPAT_14 # NetBSD 1.4,
options COMPAT_15 # NetBSD 1.5,
options COMPAT_16 # NetBSD 1.6,
options COMPAT_20 # NetBSD 2.0,
-options COMPAT_30 # NetBSD 3.0, and
-options COMPAT_40 # NetBSD 4.0 binary compatibility.
+options COMPAT_30 # NetBSD 3.0,
+options COMPAT_40 # NetBSD 4.0,
+options COMPAT_50 # NetBSD 5.0,
+options COMPAT_60 # NetBSD 6.0, and
+options COMPAT_70 # NetBSD 7.0 binary compatibility.
options COMPAT_43 # 4.3BSD, 386BSD, and BSDI compatibility.
options COMPAT_386BSD_MBRPART # recognize old partition ID
#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
CVS commit: src/sys/arch
Module Name:src Committed By: dholland Date: Sat Aug 23 21:05:39 UTC 2014 Modified Files: src/sys/arch/amd64/conf: ALL src/sys/arch/i386/conf: ALL Log Message: Add options COMPAT_44, which controls mostly MD code but should be in here anyway. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.383 -r1.384 src/sys/arch/i386/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.16 src/sys/arch/amd64/conf/ALL:1.17 --- src/sys/arch/amd64/conf/ALL:1.16 Sat Aug 23 20:26:56 2014 +++ src/sys/arch/amd64/conf/ALL Sat Aug 23 21:05:39 2014 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.16 2014/08/23 20:26:56 dholland Exp $ +# $NetBSD: ALL,v 1.17 2014/08/23 21:05:39 dholland Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.16 $" +#ident "ALL-$Revision: 1.17 $" maxusers 64 # estimated number of users @@ -143,6 +143,7 @@ options COMPAT_50 # NetBSD 5.0, options COMPAT_60 # NetBSD 6.0, and options COMPAT_70 # NetBSD 7.0 binary compatibility. options COMPAT_43 # 4.3BSD, 386BSD, and BSDI +options COMPAT_44 # 4.4BSD options COMPAT_386BSD_MBRPART # recognize old partition ID options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.383 src/sys/arch/i386/conf/ALL:1.384 --- src/sys/arch/i386/conf/ALL:1.383 Sat Aug 23 20:26:58 2014 +++ src/sys/arch/i386/conf/ALL Sat Aug 23 21:05:39 2014 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.383 2014/08/23 20:26:58 dholland Exp $ +# $NetBSD: ALL,v 1.384 2014/08/23 21:05:39 dholland Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.383 $" +#ident "ALL-$Revision: 1.384 $" maxusers 64 # estimated number of users @@ -144,6 +144,7 @@ options COMPAT_50 # NetBSD 5.0, options COMPAT_60 # NetBSD 6.0, and options COMPAT_70 # NetBSD 7.0 binary compatibility. options COMPAT_43 # 4.3BSD, 386BSD, and BSDI +options COMPAT_44 # 4.4BSD options COMPAT_386BSD_MBRPART # recognize old partition ID options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
CVS commit: src/libexec/ld.elf_so
Module Name:src Committed By: joerg Date: Sat Aug 23 19:18:41 UTC 2014 Removed Files: src/libexec/ld.elf_so: README Log Message: Outdated, kill. To generate a diff of this commit: cvs rdiff -u -r1.11 -r0 src/libexec/ld.elf_so/README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/libexec/ld.elf_so
Module Name:src
Committed By: joerg
Date: Sat Aug 23 18:05:33 UTC 2014
Modified Files:
src/libexec/ld.elf_so: rtld.h
Log Message:
Typo.
To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 src/libexec/ld.elf_so/rtld.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/rtld.h
diff -u src/libexec/ld.elf_so/rtld.h:1.118 src/libexec/ld.elf_so/rtld.h:1.119
--- src/libexec/ld.elf_so/rtld.h:1.118 Sun Aug 10 23:35:26 2014
+++ src/libexec/ld.elf_so/rtld.h Sat Aug 23 18:05:33 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld.h,v 1.118 2014/08/10 23:35:26 matt Exp $ */
+/* $NetBSD: rtld.h,v 1.119 2014/08/23 18:05:33 joerg Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -326,7 +326,7 @@ extern Elf_Sym _rtld_sym_zero;
/* Flags to be passed into _rtld_symlook_ family of functions. */
#define SYMLOOK_IN_PLT 0x01 /* Lookup for PLT symbol */
-#define SYMLOOK_DLSYM 0x02 /* Return newes versioned symbol.
+#define SYMLOOK_DLSYM 0x02 /* Return newest versioned symbol.
Used by dlsym. */
/* Flags for _rtld_load_object() and friends. */
CVS commit: src/tests/usr.bin/make
Module Name:src
Committed By: apb
Date: Sat Aug 23 16:26:13 UTC 2014
Modified Files:
src/tests/usr.bin/make: t_make.sh
Log Message:
Remove commented-out debug code that was accidentally committed yesterday.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/usr.bin/make/t_make.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/make/t_make.sh
diff -u src/tests/usr.bin/make/t_make.sh:1.5 src/tests/usr.bin/make/t_make.sh:1.6
--- src/tests/usr.bin/make/t_make.sh:1.5 Sat Aug 23 15:10:18 2014
+++ src/tests/usr.bin/make/t_make.sh Sat Aug 23 16:26:13 2014
@@ -1,4 +1,4 @@
-# $NetBSD: t_make.sh,v 1.5 2014/08/23 15:10:18 christos Exp $
+# $NetBSD: t_make.sh,v 1.6 2014/08/23 16:26:13 apb Exp $
#
# Copyright (c) 2008, 2010, 2014 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -63,8 +63,6 @@ atf_init_test_cases()
{
local filename basename atfname descr
- #exec >/tmp/apb 2>&1
- #set -x
for filename in "$(atf_get_srcdir)"/unit-tests/*.mk ; do
basename="${filename##*/}"
basename="${basename%.mk}"
@@ -73,5 +71,4 @@ atf_init_test_cases()
test_case "${atfname}" "${basename}" "${descr}"
atf_add_test_case "${atfname}"
done
- #set +x
}
CVS commit: src/usr.bin/make/unit-tests
Module Name:src Committed By: christos Date: Sat Aug 23 16:08:42 UTC 2014 Modified Files: src/usr.bin/make/unit-tests: phony-end.exp posix1.exp Log Message: fix output based on new sources To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/phony-end.exp \ src/usr.bin/make/unit-tests/posix1.exp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/make/unit-tests/phony-end.exp diff -u src/usr.bin/make/unit-tests/phony-end.exp:1.1 src/usr.bin/make/unit-tests/phony-end.exp:1.2 --- src/usr.bin/make/unit-tests/phony-end.exp:1.1 Thu Aug 21 09:44:51 2014 +++ src/usr.bin/make/unit-tests/phony-end.exp Sat Aug 23 12:08:42 2014 @@ -1,5 +1,5 @@ .TARGET="phony" .PREFIX="phony" .IMPSRC="" -.TARGET="all" .PREFIX="all" .IMPSRC="" +.TARGET="all" .PREFIX="all" .IMPSRC="phony" .TARGET="ok" .PREFIX="ok" .IMPSRC="" .TARGET="also.ok" .PREFIX="also.ok" .IMPSRC="" .TARGET="bug" .PREFIX="bug" .IMPSRC="" Index: src/usr.bin/make/unit-tests/posix1.exp diff -u src/usr.bin/make/unit-tests/posix1.exp:1.1 src/usr.bin/make/unit-tests/posix1.exp:1.2 --- src/usr.bin/make/unit-tests/posix1.exp:1.1 Sat Aug 23 11:02:04 2014 +++ src/usr.bin/make/unit-tests/posix1.exp Sat Aug 23 12:08:42 2014 @@ -182,4 +182,5 @@ cc -c -o 'obj3.o' 'obj3.c' ar -rcv 'lib.a' 'obj3.o' a - obj3.o rm -f 'obj3.o' +ar -s 'lib.a' exit status 0
CVS commit: src/tests/usr.bin/make
Module Name:src Committed By: christos Date: Sat Aug 23 16:02:54 UTC 2014 Removed Files: src/tests/usr.bin/make: d_posix.mk d_posix.out Log Message: not needed anymore. To generate a diff of this commit: cvs rdiff -u -r1.3 -r0 src/tests/usr.bin/make/d_posix.mk \ src/tests/usr.bin/make/d_posix.out Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: christos Date: Sat Aug 23 15:59:03 UTC 2014 Modified Files: src/distrib/sets/lists/tests: mi Log Message: new make tests To generate a diff of this commit: cvs rdiff -u -r1.586 -r1.587 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.586 src/distrib/sets/lists/tests/mi:1.587 --- src/distrib/sets/lists/tests/mi:1.586 Fri Aug 22 12:45:32 2014 +++ src/distrib/sets/lists/tests/mi Sat Aug 23 11:59:03 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.586 2014/08/22 16:45:32 apb Exp $ +# $NetBSD: mi,v 1.587 2014/08/23 15:59:03 christos Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -3487,6 +3487,8 @@ ./usr/tests/usr.bin/make/unit-tests/forsubst.mk tests-usr.bin-tests atf ./usr/tests/usr.bin/make/unit-tests/hash.exp tests-usr.bin-tests atf ./usr/tests/usr.bin/make/unit-tests/hash.mk tests-usr.bin-tests atf +./usr/tests/usr.bin/make/unit-tests/impsrc.exp tests-usr.bin-tests atf +./usr/tests/usr.bin/make/unit-tests/impsrc.mk tests-usr.bin-tests atf ./usr/tests/usr.bin/make/unit-tests/misc.exp tests-usr.bin-tests atf ./usr/tests/usr.bin/make/unit-tests/misc.mk tests-usr.bin-tests atf ./usr/tests/usr.bin/make/unit-tests/moderrs.exp tests-usr.bin-tests atf @@ -3507,8 +3509,12 @@ ./usr/tests/usr.bin/make/unit-tests/phony-end.mk tests-usr.bin-tests atf ./usr/tests/usr.bin/make/unit-tests/posix.exp tests-usr.bin-tests atf ./usr/tests/usr.bin/make/unit-tests/posix.mk tests-usr.bin-tests atf +./usr/tests/usr.bin/make/unit-tests/posix1.exp tests-usr.bin-tests atf +./usr/tests/usr.bin/make/unit-tests/posix1.mk tests-usr.bin-tests atf ./usr/tests/usr.bin/make/unit-tests/qequals.exp tests-usr.bin-tests atf ./usr/tests/usr.bin/make/unit-tests/qequals.mk tests-usr.bin-tests atf +./usr/tests/usr.bin/make/unit-tests/suffixes.exp tests-usr.bin-tests atf +./usr/tests/usr.bin/make/unit-tests/suffixes.mk tests-usr.bin-tests atf ./usr/tests/usr.bin/make/unit-tests/sunshcmd.exp tests-usr.bin-tests atf ./usr/tests/usr.bin/make/unit-tests/sunshcmd.mk tests-usr.bin-tests atf ./usr/tests/usr.bin/make/unit-tests/sysv.exp tests-usr.bin-tests atf
CVS commit: src/usr.bin/make/unit-tests
Module Name:src Committed By: christos Date: Sat Aug 23 15:21:35 UTC 2014 Modified Files: src/usr.bin/make/unit-tests: Makefile Log Message: Instead of adding the test in 48095 I added the tests in 48096. Add the missing test now. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/usr.bin/make/unit-tests/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/make/unit-tests/Makefile diff -u src/usr.bin/make/unit-tests/Makefile:1.45 src/usr.bin/make/unit-tests/Makefile:1.46 --- src/usr.bin/make/unit-tests/Makefile:1.45 Sat Aug 23 11:02:04 2014 +++ src/usr.bin/make/unit-tests/Makefile Sat Aug 23 11:21:35 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2014/08/23 15:02:04 christos Exp $ +# $NetBSD: Makefile,v 1.46 2014/08/23 15:21:35 christos Exp $ # # Unit tests for make(1) # The main targets are: @@ -43,6 +43,7 @@ TESTNAMES= \ order \ phony-end \ posix \ + posix1 \ qequals \ suffixes \ sunshcmd \
CVS commit: src/tests/usr.bin/make
Module Name:src
Committed By: christos
Date: Sat Aug 23 15:10:18 UTC 2014
Modified Files:
src/tests/usr.bin/make: t_make.sh
Log Message:
undo previous bogus merge of PR49085
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/make/t_make.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/make/t_make.sh
diff -u src/tests/usr.bin/make/t_make.sh:1.4 src/tests/usr.bin/make/t_make.sh:1.5
--- src/tests/usr.bin/make/t_make.sh:1.4 Sat Aug 23 11:05:41 2014
+++ src/tests/usr.bin/make/t_make.sh Sat Aug 23 11:10:18 2014
@@ -1,4 +1,4 @@
-# $NetBSD: t_make.sh,v 1.4 2014/08/23 15:05:41 christos Exp $
+# $NetBSD: t_make.sh,v 1.5 2014/08/23 15:10:18 christos Exp $
#
# Copyright (c) 2008, 2010, 2014 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -32,28 +32,12 @@ run_and_check()
local makename="${1}"; shift
local srcdir="$(atf_get_srcdir)"
- local in="${srcdir}/d_${name}.mk"
- local out="${srcdir}/d_${name}.out"
- if [ "x${name}" = "xposix" ]; then
- # Include $(INPUTFILE) for d_posix.mk, so it can re-run make
- # on the same makefile. Make sets $(MAKEFILE), but it is
- # not in POSIX, so it can't be used as such. It can't be
- # set explicitly because make always sets it itself and
- # the test shouldn't use anything not provided for by in
- # the POSIX standard.
- args="INPUTFILE='${in}'"
- atf_expect_fail 'PR/49092 [output order]'
- atf_check -o file:"${out}" -x \
- "make -kf'${in}' ${args} 2>&1 | sed -e 's,${srcdir}/d_,,'"
- else
- local testdir="$(atf_get_srcdir)/unit-tests"
-
- atf_check -s exit:0 -o ignore -e ignore \
- make -f "${testdir}/Makefile" "${makename}.out"
- atf_check -o file:"${testdir}/${makename}.exp" \
- cat "${makename}.out"
- fi
+ local testdir="$(atf_get_srcdir)/unit-tests"
+
+ atf_check -s exit:0 -o ignore -e ignore \
+ make -f "${testdir}/Makefile" "${makename}.out"
+ atf_check -o file:"${testdir}/${makename}.exp" cat "${makename}.out"
}
# Defines a test case for make(1), parsing a given file and comparing the
CVS commit: src/usr.bin/make
Module Name:src Committed By: wiz Date: Sat Aug 23 15:03:22 UTC 2014 Modified Files: src/usr.bin/make: make.1 Log Message: Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.231 -r1.232 src/usr.bin/make/make.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/make/make.1 diff -u src/usr.bin/make/make.1:1.231 src/usr.bin/make/make.1:1.232 --- src/usr.bin/make/make.1:1.231 Sat Aug 23 14:50:24 2014 +++ src/usr.bin/make/make.1 Sat Aug 23 15:03:22 2014 @@ -1,4 +1,4 @@ -.\" $NetBSD: make.1,v 1.231 2014/08/23 14:50:24 christos Exp $ +.\" $NetBSD: make.1,v 1.232 2014/08/23 15:03:22 wiz Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" from: @(#)make.1 8.4 (Berkeley) 3/19/94 .\" -.Dd February 14, 2014 +.Dd August 23, 2014 .Dt MAKE 1 .Os .Sh NAME
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: christos
Date: Sat Aug 23 15:02:04 UTC 2014
Modified Files:
src/usr.bin/make/unit-tests: Makefile
Added Files:
src/usr.bin/make/unit-tests: posix1.exp posix1.mk
Log Message:
Convert test in PR/49085
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r0 -r1.1 src/usr.bin/make/unit-tests/posix1.exp \
src/usr.bin/make/unit-tests/posix1.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/unit-tests/Makefile
diff -u src/usr.bin/make/unit-tests/Makefile:1.44 src/usr.bin/make/unit-tests/Makefile:1.45
--- src/usr.bin/make/unit-tests/Makefile:1.44 Thu Aug 21 18:00:30 2014
+++ src/usr.bin/make/unit-tests/Makefile Sat Aug 23 11:02:04 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2014/08/21 22:00:30 apb Exp $
+# $NetBSD: Makefile,v 1.45 2014/08/23 15:02:04 christos Exp $
#
# Unit tests for make(1)
# The main targets are:
@@ -32,6 +32,7 @@ TESTNAMES= \
forloop \
forsubst \
hash \
+ impsrc \
misc \
moderrs \
modmatch \
@@ -43,6 +44,7 @@ TESTNAMES= \
phony-end \
posix \
qequals \
+ suffixes \
sunshcmd \
sysv \
ternary \
Added files:
Index: src/usr.bin/make/unit-tests/posix1.exp
diff -u /dev/null src/usr.bin/make/unit-tests/posix1.exp:1.1
--- /dev/null Sat Aug 23 11:02:04 2014
+++ src/usr.bin/make/unit-tests/posix1.exp Sat Aug 23 11:02:04 2014
@@ -0,0 +1,185 @@
+$(VAR) = "foo bar baz"
+a
+b
+c
+foo baR baz, bar baz, foo bar baz, fooadd baradd bazadd
+mkdir -p 'dir'
+touch 'dir/obj_1.h'
+mkdir -p 'dir'
+printf '#include "obj_1.h"\nconst char* obj_1 = "dir/obj_1.c";' \
+>'dir/obj_1.c'
+Local variables
+ $(@)="dir/obj_1.o" $(<)="dir/obj_1.c"
+ $(*)="dir/obj_1" $(?)="dir/obj_1.h dir/obj_1.c"
+ $(%)=""
+
+Directory and filename parts of local variables
+ $(@D)="dir" $(@F)="obj_1.o"
+ $('obj_2.c'
+mkdir -p '.'
+touch 'obj_2.h'
+Local variables
+ $(@)="obj2.o" $(<)="obj_2.c"
+ $(*)="obj2" $(?)="obj_2.c obj_2.h dir/obj_1.h"
+ $(%)=""
+
+Directory and filename parts of local variables
+ $(@D)="." $(@F)="obj2.o"
+ $('obj3.c'
+Local variables
+ $(@)="lib.a" $(<)="obj3.c"
+ $(*)="obj3" $(?)="obj3.h dir/dummy obj3.c"
+ $(%)="obj3.o"
+
+Directory and filename parts of local variables
+ $(@D)="." $(@F)="lib.a"
+ $('$(@)'
+
+dir/obj_1.h obj_2.h obj3.h dummy dir/dummy:
+ mkdir -p '$(@D)'
+ touch '$(@)'
CVS commit: src
Module Name:src
Committed By: christos
Date: Sat Aug 23 14:50:24 UTC 2014
Modified Files:
src/tests/usr.bin/make: t_make.sh
src/usr.bin/make: make.1 parse.c var.c
Added Files:
src/tests/usr.bin/make: d_posix.mk d_posix.out
Log Message:
PR/49085: Jarmo Jaakkola: fix several parsing errors
Don't exit from var.c:Var_Parse() before possible modifiers are handled
on D and F modified versions of local variables. Properly expand $(?D)
and $(?F) too.
Make line continuations in rule's commands POSIX compliant.
Fix the syntax error caused by lib(member) as the last target before
a dependency operator.
Document the line continuation change in the manual page. Also talk
more about the POSIX style local variables and their modifiers.
Add tests covering the fixed problems into d_posix.mk. The test is
a known failure at the moment because of PR 49086 and PR 49092.
[XXX: unconverted tests]
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.3 src/tests/usr.bin/make/d_posix.mk \
src/tests/usr.bin/make/d_posix.out
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/make/t_make.sh
cvs rdiff -u -r1.230 -r1.231 src/usr.bin/make/make.1
cvs rdiff -u -r1.198 -r1.199 src/usr.bin/make/parse.c
cvs rdiff -u -r1.186 -r1.187 src/usr.bin/make/var.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/make/t_make.sh
diff -u src/tests/usr.bin/make/t_make.sh:1.2 src/tests/usr.bin/make/t_make.sh:1.3
--- src/tests/usr.bin/make/t_make.sh:1.2 Fri Aug 22 12:45:32 2014
+++ src/tests/usr.bin/make/t_make.sh Sat Aug 23 10:50:24 2014
@@ -1,4 +1,4 @@
-# $NetBSD: t_make.sh,v 1.2 2014/08/22 16:45:32 apb Exp $
+# $NetBSD: t_make.sh,v 1.3 2014/08/23 14:50:24 christos Exp $
#
# Copyright (c) 2008, 2010, 2014 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -32,12 +32,28 @@ run_and_check()
local makename="${1}"; shift
local srcdir="$(atf_get_srcdir)"
- local testdir="$(atf_get_srcdir)/unit-tests"
+ local in="${srcdir}/d_${name}.mk"
+ local out="${srcdir}/d_${name}.out"
- atf_check -s exit:0 -o ignore -e ignore \
- make -f "${testdir}/Makefile" "${makename}.out"
- atf_check -o file:"${testdir}/${makename}.exp" \
- cat "${makename}.out"
+ if [ "x${name}" = "xposix" ]; then
+ # Include $(INPUTFILE) for d_posix.mk, so it can re-run make
+ # on the same makefile. Make sets $(MAKEFILE), but it is
+ # not in POSIX, so it can't be used as such. It can't be
+ # set explicitly because make always sets it itself and
+ # the test shouldn't use anything not provided for by in
+ # the POSIX standard.
+ args="INPUTFILE='${in}'"
+ atf_expect_fail 'PR/49086 [$(<)], PR/49092 [output order]'
+ atf_check -o file:"${out}" -x \
+ "make -kf'${in}' ${args} 2>&1 | sed -e 's,${srcdir}/d_,,'"
+ else
+ local testdir="$(atf_get_srcdir)/unit-tests"
+
+ atf_check -s exit:0 -o ignore -e ignore \
+ make -f "${testdir}/Makefile" "${makename}.out"
+ atf_check -o file:"${testdir}/${makename}.exp" \
+ cat "${makename}.out"
+ fi
}
# Defines a test case for make(1), parsing a given file and comparing the
Index: src/usr.bin/make/make.1
diff -u src/usr.bin/make/make.1:1.230 src/usr.bin/make/make.1:1.231
--- src/usr.bin/make/make.1:1.230 Sat Feb 15 13:55:30 2014
+++ src/usr.bin/make/make.1 Sat Aug 23 10:50:24 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: make.1,v 1.230 2014/02/15 18:55:30 sjg Exp $
+.\" $NetBSD: make.1,v 1.231 2014/08/23 14:50:24 christos Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -382,8 +382,11 @@ conditional directives, for loops, and c
In general, lines may be continued from one line to the next by ending
them with a backslash
.Pq Ql \e .
-The trailing newline character and initial whitespace on the following
-line are compressed into a single space.
+For any line that is not a shell command line (i.e. it does not begin
+with a tab), the backslash, the following newline character, and initial
+whitespace on the following line are compressed into a single space.
+On command lines the backslash and the newline are left intact and
+if the following line begins with tab(s), the first one is removed.
.Sh FILE DEPENDENCY SPECIFICATIONS
Dependency lines consist of one or more targets, an operator, and zero
or more sources.
@@ -500,20 +503,52 @@ operation does not change their behavior
For example, any command which needs to use
.Dq cd
or
-.Dq chdir ,
-without side-effect should be put in parenthesis:
+.Dq chdir
+without side-effects should be put in parenthesis so they are executed
+in a subshell:
.Bd -literal -offset indent
avoid-chdir-side-effects:
@echo Building $@ in `pwd`
- @(cd ${.CURDIR} && ${.MAKE} $@)
+ @(cd ${.CURDIR} && ${MAKE} $@)
@echo Back in `pwd`
ensure-one-shell-regardless-of-mode:
@echo Building $@ in `pwd`; \\
- (cd ${.CURDIR} && ${.MAKE} $@); \\
+ (cd ${.CURDIR} && ${MAKE} $@);
CVS commit: src/sys/external/bsd/drm2
Module Name:src Committed By: riastradh Date: Sat Aug 23 08:03:34 UTC 2014 Modified Files: src/sys/external/bsd/drm2/dist/drm/nouveau: nouveau_bo.c nouveau_drm.c nouveau_drm.h nouveau_fence.c nouveau_gem.c nouveau_nv10_fence.c nouveau_nv50_display.c src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine: nouveau_engine_xtensa.c src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/copy: nouveau_engine_copy_nva3.c src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/crypt: nouveau_engine_crypt_nv84.c nouveau_engine_crypt_nv98.c src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/device: nouveau_engine_device_base.c src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/disp: nouveau_engine_disp_dacnv50.c nouveau_engine_disp_nv04.c nouveau_engine_disp_nv50.c nouveau_engine_disp_nvd0.c nv50.h src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo: nouveau_engine_fifo_base.c nouveau_engine_fifo_nvc0.c nouveau_engine_fifo_nve0.c nve0.h src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/graph: nouveau_engine_graph_ctxnvd7.c nouveau_engine_graph_gm107.c nouveau_engine_graph_nv50.c nouveau_engine_graph_nvc0.c src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/perfmon: nouveau_engine_perfmon_base.c src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/core: device.h src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/engine: device.h src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/subdev: bar.h fb.h pwr.h src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/bar: nouveau_subdev_bar_base.c src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/instmem: nouveau_subdev_instmem_nv04.c nouveau_subdev_instmem_nv40.c nv04.h src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/pwr: nouveau_subdev_pwr_base.c src/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04: nouveau_dispnv04_tvmodesnv17.c nouveau_dispnv04_tvnv17.c src/sys/external/bsd/drm2/include/drm: drm_agp_netbsd.h src/sys/external/bsd/drm2/include/linux: bitops.h i2c.h mutex.h pagemap.h pm_runtime.h spinlock.h vmalloc.h src/sys/external/bsd/drm2/nouveau: files.nouveau nouveau_module.c Log Message: Another round of nouveau whack-a-mole. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bo.c cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c \ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fence.c \ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_gem.c cvs rdiff -u -r1.1.1.1 -r1.2 \ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.h \ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv10_fence.c \ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv50_display.c cvs rdiff -u -r1.1.1.1 -r1.2 \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/nouveau_engine_xtensa.c cvs rdiff -u -r1.1.1.1 -r1.2 \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/copy/nouveau_engine_copy_nva3.c cvs rdiff -u -r1.1.1.1 -r1.2 \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/crypt/nouveau_engine_crypt_nv84.c \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/crypt/nouveau_engine_crypt_nv98.c cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/device/nouveau_engine_device_base.c cvs rdiff -u -r1.1.1.1 -r1.2 \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/disp/nouveau_engine_disp_dacnv50.c \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/disp/nouveau_engine_disp_nv04.c \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/disp/nouveau_engine_disp_nv50.c \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/disp/nouveau_engine_disp_nvd0.c \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/disp/nv50.h cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_base.c cvs rdiff -u -r1.1.1.1 -r1.2 \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nvc0.c \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nve0.c \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nve0.h cvs rdiff -u -r1.1.1.1 -r1.2 \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/graph/nouveau_engine_graph_ctxnvd7.c \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/graph/nouveau_engine_graph_gm107.c \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/graph/nouveau_engine_graph_nv50.c \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/gr
