Module Name:    src
Committed By:   uebayasi
Date:           Fri Nov 14 09:03:39 UTC 2014

Modified Files:
        src/distrib/sets/lists/tests: mi
        src/etc/mtree: NetBSD.dist.tests
        src/tests/usr.bin: Makefile
Added Files:
        src/tests/usr.bin/ld: Makefile t_script.sh

Log Message:
Minimal linker script test.


To generate a diff of this commit:
cvs rdiff -u -r1.596 -r1.597 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.111 -r1.112 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r1.19 -r1.20 src/tests/usr.bin/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/ld/Makefile \
    src/tests/usr.bin/ld/t_script.sh

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.596 src/distrib/sets/lists/tests/mi:1.597
--- src/distrib/sets/lists/tests/mi:1.596	Wed Oct 29 16:24:32 2014
+++ src/distrib/sets/lists/tests/mi	Fri Nov 14 09:03:39 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.596 2014/10/29 16:24:32 uebayasi Exp $
+# $NetBSD: mi,v 1.597 2014/11/14 09:03:39 uebayasi Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -3463,6 +3463,10 @@
 ./usr/tests/usr.bin/jot/Kyuafile		tests-usr.bin-tests	atf,kyua
 ./usr/tests/usr.bin/jot/d_basic.out		tests-usr.bin-tests	atf
 ./usr/tests/usr.bin/jot/t_jot			tests-usr.bin-tests	atf
+./usr/tests/usr.bin/ld				tests-usr.bin-tests
+./usr/tests/usr.bin/ld/Atffile			tests-usr.bin-tests	atf
+./usr/tests/usr.bin/ld/Kyuafile			tests-usr.bin-tests	atf,kyua
+./usr/tests/usr.bin/ld/t_script			tests-usr.bin-tests	atf
 ./usr/tests/usr.bin/m4				tests-usr.bin-tests
 ./usr/tests/usr.bin/m4/Atffile			tests-usr.bin-tests	atf
 ./usr/tests/usr.bin/m4/Kyuafile			tests-usr.bin-tests	atf,kyua

Index: src/etc/mtree/NetBSD.dist.tests
diff -u src/etc/mtree/NetBSD.dist.tests:1.111 src/etc/mtree/NetBSD.dist.tests:1.112
--- src/etc/mtree/NetBSD.dist.tests:1.111	Sun Oct 12 12:32:15 2014
+++ src/etc/mtree/NetBSD.dist.tests	Fri Nov 14 09:03:39 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: NetBSD.dist.tests,v 1.111 2014/10/12 12:32:15 uebayasi Exp $
+#	$NetBSD: NetBSD.dist.tests,v 1.112 2014/11/14 09:03:39 uebayasi Exp $
 
 ./usr/libdata/debug/usr/tests
 ./usr/libdata/debug/usr/tests/atf
@@ -359,6 +359,7 @@
 ./usr/tests/usr.bin/netpgpverify
 ./usr/tests/usr.bin/infocmp
 ./usr/tests/usr.bin/jot
+./usr/tests/usr.bin/ld
 ./usr/tests/usr.bin/m4
 ./usr/tests/usr.bin/make
 ./usr/tests/usr.bin/make/unit-tests

Index: src/tests/usr.bin/Makefile
diff -u src/tests/usr.bin/Makefile:1.19 src/tests/usr.bin/Makefile:1.20
--- src/tests/usr.bin/Makefile:1.19	Tue Jan  7 16:47:13 2014
+++ src/tests/usr.bin/Makefile	Fri Nov 14 09:03:39 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.19 2014/01/07 16:47:13 gson Exp $
+#	$NetBSD: Makefile,v 1.20 2014/11/14 09:03:39 uebayasi Exp $
 #
 
 .include <bsd.own.mk>
@@ -6,7 +6,7 @@
 TESTSDIR=       ${TESTSBASE}/usr.bin
 
 TESTS_SUBDIRS=	awk basename bzip2 cc cmp config cut \
-		diff dirname find grep gzip id infocmp jot m4 make mkdep \
+		diff dirname find grep gzip id infocmp jot ld m4 make mkdep \
 		nbperf netpgpverify pr rump_server shmif_dumpbus sdiff \
 		sed sort tmux tr unifdef vmstat xlint
 

Added files:

Index: src/tests/usr.bin/ld/Makefile
diff -u /dev/null src/tests/usr.bin/ld/Makefile:1.1
--- /dev/null	Fri Nov 14 09:03:39 2014
+++ src/tests/usr.bin/ld/Makefile	Fri Nov 14 09:03:39 2014
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile,v 1.1 2014/11/14 09:03:39 uebayasi Exp $
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/usr.bin/ld
+
+TESTS_SH=	t_script
+
+.include <bsd.test.mk>
Index: src/tests/usr.bin/ld/t_script.sh
diff -u /dev/null src/tests/usr.bin/ld/t_script.sh:1.1
--- /dev/null	Fri Nov 14 09:03:39 2014
+++ src/tests/usr.bin/ld/t_script.sh	Fri Nov 14 09:03:39 2014
@@ -0,0 +1,83 @@
+#	$NetBSD: t_script.sh,v 1.1 2014/11/14 09:03:39 uebayasi Exp $
+#
+# Copyright (c) 2014 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+atf_test_case multisec
+multisec_head() {
+	atf_set "descr" "check if multiple SECTIONS commands work"
+	atf_set "require.progs" "cc" "ld" "readelf" "nm" "sed" "grep"
+}
+
+multisec_body() {
+	cat > test.c << EOF
+#include <sys/cdefs.h>
+char a __section(".data.a") = 'a';
+char b __section(".data.b") = 'b';
+char c __section(".data.c") = 'c';
+EOF
+	atf_check -s exit:0 -o ignore -e ignore cc -c test.c
+
+	cat > test.x << EOF
+SECTIONS {
+	.data : {
+		*(.data)
+		*(.data.a)
+	}
+}
+SECTIONS {
+	.data : {
+		*(.data)
+		*(.data.b)
+	}
+}
+EOF
+	atf_check -s exit:0 -o ignore -e ignore \
+	    ld -r -T test.x -Map test.map -o test.ro test.o
+	extract_section_names test.ro >test.secs
+	extract_symbol_names test.ro >test.syms
+	atf_check -s exit:1 -o ignore -e ignore \
+	    grep '\.data\.a$' test.secs
+	atf_check -s exit:1 -o ignore -e ignore \
+	    grep '\.data\.b$' test.secs
+	atf_check -s exit:0 -o ignore -e ignore \
+	    grep '\.data\.c$' test.secs
+}
+
+extract_section_names() {
+	readelf -S "$1" |
+	sed -ne '/\] \./ { s/^.*\] //; s/ .*$//; p }'
+}
+
+extract_symbol_names() {
+	nm -n "$1" |
+	sed -e 's/^.* //'
+}
+
+atf_init_test_cases()
+{
+
+	atf_add_test_case multisec
+}

Reply via email to