Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/tests/lib/libi386 Fix the build for MKCOMPAT=no.



details:   https://anonhg.NetBSD.org/src/rev/e7f7347d3dbe
branches:  trunk
changeset: 971988:e7f7347d3dbe
user:      yhardy <yhardy%NetBSD.org@localhost>
date:      Mon May 11 21:51:25 2020 +0000

description:
Fix the build for MKCOMPAT=no.

The t_user_ldt test needs the i386 compat library which is only built
when MKCOMPAT=yes.

diffstat:

 distrib/sets/lists/debug/md.amd64 |  4 ++--
 distrib/sets/lists/tests/md.amd64 |  4 ++--
 tests/lib/libi386/Makefile        |  4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diffs (52 lines):

diff -r e288e8969a0d -r e7f7347d3dbe distrib/sets/lists/debug/md.amd64
--- a/distrib/sets/lists/debug/md.amd64 Mon May 11 21:40:12 2020 +0000
+++ b/distrib/sets/lists/debug/md.amd64 Mon May 11 21:51:25 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.108 2020/04/26 09:08:40 maxv Exp $
+# $NetBSD: md.amd64,v 1.109 2020/05/11 21:51:25 yhardy Exp $
 ./usr/lib/i386/12.202++_g.a                    comp-c-debuglib         debuglib,compat,12.202xx
 ./usr/lib/i386/libi386_g.a                     comp-c-debuglib         debuglib,compat
 ./usr/lib/i386/libiberty_g.a                   comp-obsolete           obsolete
@@ -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
diff -r e288e8969a0d -r e7f7347d3dbe distrib/sets/lists/tests/md.amd64
--- a/distrib/sets/lists/tests/md.amd64 Mon May 11 21:40:12 2020 +0000
+++ b/distrib/sets/lists/tests/md.amd64 Mon May 11 21:51:25 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.10 2020/04/28 13:43:45 rjs Exp $
+# $NetBSD: md.amd64,v 1.11 2020/05/11 21:51:25 yhardy Exp $
 ./usr/tests/kernel/arch/x86/Atffile            tests-obsolete  obsolete
 ./usr/tests/kernel/arch/x86/Kyuafile           tests-obsolete  obsolete
 ./usr/tests/kernel/arch/x86/t_ptrace_wait      tests-obsolete  obsolete
@@ -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
diff -r e288e8969a0d -r e7f7347d3dbe tests/lib/libi386/Makefile
--- a/tests/lib/libi386/Makefile        Mon May 11 21:40:12 2020 +0000
+++ b/tests/lib/libi386/Makefile        Mon May 11 21:51:25 2020 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2020/04/20 12:08:08 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2020/05/11 21:51:25 yhardy Exp $
 
 .include <bsd.own.mk>
 
 TESTSDIR=      ${TESTSBASE}/lib/libi386
 
-.if ${MACHINE} == "amd64"
+.if ${MACHINE} == "amd64" && ${MKCOMPAT} == "yes"
 SHLIBINSTALLDIR=       /usr/lib/i386
 COPTS+=                -m32
 LDFLAGS+=      -m32



Home | Main Index | Thread Index | Old Index