Re: CVS commit: src

[Yorick Hardy <yorickhardy%gmail.com@localhost>]

Dear Maxime,

On 2020-04-19, Maxime Villard wrote:
> Module Name:	src
> Committed By:	maxv
> Date:		Sun Apr 19 13:22:58 UTC 2020
> 
> Modified Files:
> 	src/distrib/sets/lists/debug: md.amd64
> 	src/distrib/sets/lists/tests: md.amd64 mi
> 	src/etc/mtree: NetBSD.dist.tests
> 	src/tests/lib: Makefile
> Added Files:
> 	src/tests/lib/libi386: Makefile t_user_ldt.c
> 
> Log Message:
> Add tests for USER_LDT.
> 
> 
> To generate a diff of this commit:
> cvs rdiff -u -r1.106 -r1.107 src/distrib/sets/lists/debug/md.amd64
> cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/tests/md.amd64
> cvs rdiff -u -r1.835 -r1.836 src/distrib/sets/lists/tests/mi
> cvs rdiff -u -r1.161 -r1.162 src/etc/mtree/NetBSD.dist.tests
> cvs rdiff -u -r1.32 -r1.33 src/tests/lib/Makefile
> cvs rdiff -u -r0 -r1.1 src/tests/lib/libi386/Makefile \
>     src/tests/lib/libi386/t_user_ldt.c
> 
> Please note that diffs are not public domain; they are subject to the
> copyright notices on the relevant files.

I think this test depends on MKCOMPAT=yes. Does the attached the patch
below look reasonable?

-- 
Kind regards,

Yorick Hardy


Index: distrib/sets/lists/debug/md.amd64
===================================================================
RCS file: /cvsroot/src/distrib/sets/lists/debug/md.amd64,v
retrieving revision 1.108
diff -u -r1.108 md.amd64
--- distrib/sets/lists/debug/md.amd64	26 Apr 2020 09:08:40 -0000	1.108
+++ distrib/sets/lists/debug/md.amd64	6 May 2020 22:28:04 -0000
@@ -25,7 +25,7 @@
 ./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_wait6.debug	tests-obsolete	obsolete
 ./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_waitid.debug	tests-obsolete	obsolete
 ./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_waitpid.debug	tests-obsolete	obsolete
-./usr/libdata/debug/usr/tests/lib/libi386/t_user_ldt.debug	tests-lib-debug	debug,atf
+./usr/libdata/debug/usr/tests/lib/libi386/t_user_ldt.debug	tests-lib-debug	debug,atf,compat
 ./usr/libdata/debug/usr/tests/lib/libnvmm/h_io_assist.debug	tests-lib-debug	debug,atf
 ./usr/libdata/debug/usr/tests/lib/libnvmm/h_mem_assist.debug	tests-lib-debug	debug,atf
 ./usr/libdata/debug/usr/tests/modules/t_x86_pte.debug	tests-sys-debug		debug,atf
Index: distrib/sets/lists/tests/md.amd64
===================================================================
RCS file: /cvsroot/src/distrib/sets/lists/tests/md.amd64,v
retrieving revision 1.10
diff -u -r1.10 md.amd64
--- distrib/sets/lists/tests/md.amd64	28 Apr 2020 13:43:45 -0000	1.10
+++ distrib/sets/lists/tests/md.amd64	6 May 2020 22:28:04 -0000
@@ -7,7 +7,7 @@
 ./usr/tests/kernel/arch/x86/t_ptrace_wait6	tests-obsolete	obsolete
 ./usr/tests/kernel/arch/x86/t_ptrace_waitid	tests-obsolete	obsolete
 ./usr/tests/kernel/arch/x86/t_ptrace_waitpid	tests-obsolete	obsolete
-./usr/tests/lib/libi386/t_user_ldt		tests-lib-tests	compattestfile,atf
+./usr/tests/lib/libi386/t_user_ldt		tests-lib-tests	compattestfile,atf,compat
 ./usr/tests/lib/libnvmm/h_io_assist		tests-lib-tests	compattestfile,atf
 ./usr/tests/lib/libnvmm/t_io_assist		tests-lib-tests	compattestfile,atf
 ./usr/tests/lib/libnvmm/h_mem_assist		tests-lib-tests	compattestfile,atf
Index: tests/lib/libi386/Makefile
===================================================================
RCS file: /cvsroot/src/tests/lib/libi386/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- tests/lib/libi386/Makefile	20 Apr 2020 12:08:08 -0000	1.3
+++ tests/lib/libi386/Makefile	6 May 2020 22:28:04 -0000
@@ -4,7 +4,7 @@
 
 TESTSDIR=	${TESTSBASE}/lib/libi386
 
-.if ${MACHINE} == "amd64"
+.if ${MACHINE} == "amd64" && ${MKCOMPATTESTS} == "yes"
 SHLIBINSTALLDIR=	/usr/lib/i386
 COPTS+=		-m32
 LDFLAGS+=	-m32