[src/trunk]: src Add placeholder test programs for share/mk files.

[jmmv <jmmv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ddca15561f09
branches:  trunk
changeset: 781210:ddca15561f09
user:      jmmv <jmmv%NetBSD.org@localhost>
date:      Sun Aug 26 23:03:20 2012 +0000

description:
Add placeholder test programs for share/mk files.

The main goal of this change is to simplify the further addition of test
cases for the share/mk infrastructure by adding a few placeholder test
programs to the tests tree.

To not leave these test programs empty, I have added a bunch of extremely
simple test cases to them.

diffstat:

 distrib/sets/lists/tests/mi |   10 +++-
 doc/CHANGES                 |    4 +-
 etc/mtree/NetBSD.dist.tests |    4 +-
 tests/Makefile              |    6 +-
 tests/share/Makefile        |    9 +++
 tests/share/mk/Makefile     |   12 ++++
 tests/share/mk/common.subr  |  132 ++++++++++++++++++++++++++++++++++++++++++++
 tests/share/mk/t_lib.sh     |   54 ++++++++++++++++++
 tests/share/mk/t_own.sh     |   72 ++++++++++++++++++++++++
 tests/share/mk/t_prog.sh    |   84 ++++++++++++++++++++++++++++
 tests/share/mk/t_test.sh    |  111 +++++++++++++++++++++++++++++++++++++
 11 files changed, 494 insertions(+), 4 deletions(-)

diffs (truncated from 579 to 300 lines):

diff -r 91ec868446f7 -r ddca15561f09 distrib/sets/lists/tests/mi
--- a/distrib/sets/lists/tests/mi       Sun Aug 26 22:37:19 2012 +0000
+++ b/distrib/sets/lists/tests/mi       Sun Aug 26 23:03:20 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.489 2012/08/24 20:24:39 jmmv Exp $
+# $NetBSD: mi,v 1.490 2012/08/26 23:03:21 jmmv Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -2931,6 +2931,14 @@
 ./usr/tests/sbin/sysctl/Atffile                        tests-sbin-tests        atf
 ./usr/tests/sbin/sysctl/t_perm                 tests-sbin-tests        atf
 ./usr/tests/sbin/sysctl/t_sysctl               tests-sbin-tests        atf
+./usr/tests/share                              tests-sys-tests
+./usr/tests/share/Atffile                      tests-sys-tests         atf
+./usr/tests/share/mk                           tests-mk-tests
+./usr/tests/share/mk/Atffile                   tests-mk-tests          atf
+./usr/tests/share/mk/t_lib                     tests-mk-tests          atf
+./usr/tests/share/mk/t_own                     tests-mk-tests          atf
+./usr/tests/share/mk/t_prog                    tests-mk-tests          atf
+./usr/tests/share/mk/t_test                    tests-mk-tests          atf
 ./usr/tests/sys                                        tests-sys-tests
 ./usr/tests/sys/Atffile                                tests-sys-tests atf
 ./usr/tests/sys/rc                             tests-sys-tests
diff -r 91ec868446f7 -r ddca15561f09 doc/CHANGES
--- a/doc/CHANGES       Sun Aug 26 22:37:19 2012 +0000
+++ b/doc/CHANGES       Sun Aug 26 23:03:20 2012 +0000
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:                   <$Revision: 1.1739 $>
+# LIST OF CHANGES FROM LAST RELEASE:                   <$Revision: 1.1740 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -107,3 +107,5 @@
        mfi(8): Added support for LSI SAS2208-based controllers.
                [bouyer 20120823]
        mkdep(1): Add -P option.  [jmmv 20120826]
+       share/mk: Add placeholder test programs (with some very basic test
+               cases within) for common bsd.*.mk modules.  [jmmv 20120826]
diff -r 91ec868446f7 -r ddca15561f09 etc/mtree/NetBSD.dist.tests
--- a/etc/mtree/NetBSD.dist.tests       Sun Aug 26 22:37:19 2012 +0000
+++ b/etc/mtree/NetBSD.dist.tests       Sun Aug 26 23:03:20 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: NetBSD.dist.tests,v 1.82 2012/08/14 19:13:54 alnsn Exp $
+#      $NetBSD: NetBSD.dist.tests,v 1.83 2012/08/26 23:03:22 jmmv Exp $
 
 ./usr/libdata/debug/usr/tests
 ./usr/libdata/debug/usr/tests/atf
@@ -269,6 +269,8 @@
 ./usr/tests/sbin/resize_ffs
 ./usr/tests/sbin/route
 ./usr/tests/sbin/sysctl
+./usr/tests/share
+./usr/tests/share/mk
 ./usr/tests/sys
 ./usr/tests/sys/rc
 ./usr/tests/usr.bin
diff -r 91ec868446f7 -r ddca15561f09 tests/Makefile
--- a/tests/Makefile    Sun Aug 26 22:37:19 2012 +0000
+++ b/tests/Makefile    Sun Aug 26 23:03:20 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2012/08/08 13:57:05 christos Exp $
+# $NetBSD: Makefile,v 1.39 2012/08/26 23:03:20 jmmv Exp $
 
 .include <bsd.own.mk>
 
@@ -26,6 +26,10 @@
 SUBDIR+=       ipf
 . endif
 
+. if ${MKSHARE} != "no"
+SUBDIR+=       share
+. endif
+
 .include <bsd.test.mk>
 
 .else
diff -r 91ec868446f7 -r ddca15561f09 tests/share/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/share/Makefile      Sun Aug 26 23:03:20 2012 +0000
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile,v 1.1 2012/08/26 23:03:21 jmmv Exp $
+
+.include <bsd.own.mk>
+
+TESTSDIR=      ${TESTSBASE}/share
+
+TESTS_SUBDIRS= mk
+
+.include <bsd.test.mk>
diff -r 91ec868446f7 -r ddca15561f09 tests/share/mk/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/share/mk/Makefile   Sun Aug 26 23:03:20 2012 +0000
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.1 2012/08/26 23:03:21 jmmv Exp $
+
+.include <bsd.own.mk>
+
+TESTSDIR=      ${TESTSBASE}/share/mk
+
+TESTS_SH=      t_lib t_own t_prog t_test
+.for test in ${TESTS_SH}
+TESTS_SH_SRC_${test}=  ${test}.sh common.subr
+.endfor
+
+.include <bsd.test.mk>
diff -r 91ec868446f7 -r ddca15561f09 tests/share/mk/common.subr
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/share/mk/common.subr        Sun Aug 26 23:03:20 2012 +0000
@@ -0,0 +1,132 @@
+# Copyright 2012 Google 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:
+#
+# * Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# * 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.
+# * Neither the name of Google Inc. nor the names of its contributors
+#   may be used to endorse or promote products derived from this software
+#   without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT
+# OWNER 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.
+
+# Dumps a file to the test's stdout for debugging purposes.
+dump_file() {
+       local file="${1}"; shift
+
+       echo "==== BEGIN ${file}"
+       cat "${file}"
+       echo "==== END   ${file}"
+}
+
+# Creates a C source file with a single symbol in it.
+#
+# The file parameter specifies the path to the file to create, WITHOUT the
+# C extension.  Both a source file and a header file are created.  Any
+# intermediate directories are created too.
+#
+# The symbol parameter specifies the name of the symbol to place in the
+# module, which is defined as a string holding the name of the module.
+create_c_module() {
+       local file="${1}"; shift
+       local symbol="${1}"; shift
+
+       mkdir -p "$(dirname ${file})"
+       echo "extern const char *${symbol};" >"${file}.h"
+       echo "const char *${symbol} = \"${file}\";" >"${file}.c"
+
+       dump_file "${file}.h"
+       dump_file "${file}.c"
+}
+
+# Creates a main C source file that references a set of modules.
+#
+# The modules to be referenced should have been created with
+# create_c_module.  The generated source file ensures that all the modules
+# are referenced in some way, which helps in testing that the generated
+# binary holds all the necessary objects.
+#
+# The file parameter specifies the name of the file to create.
+#
+# The rest of the parameters are module:symbol pairs that specify the
+# module to include and the symbol within them to reference.
+create_main_using_modules() {
+       local file="${1}"; shift
+
+       local modules=
+       local symbols=
+       for spec in "${@}"; do
+               modules="${modules} $(echo ${spec} | cut -d : -f 1)"
+               symbols="${symbols} $(echo ${spec} | cut -d : -f 2)"
+       done
+
+       echo '#include <stdio.h>' >"${file}"
+       for module in ${modules}; do
+               echo "#include \"${module}\"" >>"${file}"
+       done
+       echo 'int main(void) {' >>"${file}"
+       for symbol in ${symbols}; do
+               echo "printf(\"%s\n\", ${symbol});" >>"${file}"
+       done
+       echo 'return 0; }' >>"${file}"
+
+       dump_file "${file}"
+}
+
+# Creates a mk.conf file and points MAKECONF to it.
+#
+# The first argument specifies the name of the configuration file to
+# create.
+#
+# The rest of the arguments include a collection of modifiers for the
+# generated configuration file and/or a collection of explicit variable
+# names and their values to set.
+#
+# The qualifiers can be one of:
+# - owngrp: Override the *OWN and *GRP variables to point to the current
+#   user.
+create_make_conf() {
+       local file="${1}"; shift
+
+       echo "# Test configuration file" >"${file}"
+       for arg in "${@}"; do
+               case "${arg}" in
+               *=*)
+                       echo "${arg}" >>"${file}"
+                       ;;
+               owngrp)
+                       for class in BIN DOC LIB LINKS MAN; do
+                               echo "${class}OWN=$(id -un)" >>"${file}"
+                               echo "${class}GRP=$(id -gn)" >>"${file}"
+                       done
+                       ;;
+               esac
+       done
+
+       case "${file}" in
+       /*)
+               MAKECONF="${file}"; export MAKECONF
+               ;;
+       *)
+               MAKECONF="$(pwd)/${file}"; export MAKECONF
+               ;;
+       esac
+
+       dump_file "${file}"
+}
diff -r 91ec868446f7 -r ddca15561f09 tests/share/mk/t_lib.sh
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/share/mk/t_lib.sh   Sun Aug 26 23:03:20 2012 +0000
@@ -0,0 +1,54 @@
+# Copyright 2012 Google 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:
+#
+# * Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# * 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.
+# * Neither the name of Google Inc. nor the names of its contributors
+#   may be used to endorse or promote products derived from this software
+#   without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT
+# OWNER 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 defaults__build_and_install
+defaults__build_and_install_body() {
+       create_c_module module1 first
+       create_c_module module2 second
+
+       cat >Makefile <<EOF
+LIB = two-modules
+SRCS = module1.c module2.c
+.include <bsd.lib.mk>
+EOF
+
+       atf_check -o ignore make
+       mkdir -p root/usr/lib
+       mkdir -p root/usr/libdata/lint
+       create_make_conf mk.conf owngrp DESTDIR="$(pwd)/root"
+       atf_check -o ignore make install
+
+       create_main_using_modules main.c module1.h:first module2.h:second
+       atf_check -o ignore gcc -I. -Lroot/usr/lib -o main main.c -ltwo-modules
+
+       atf_check -o inline:'module1\nmodule2\n' ./main
+}
+
+atf_init_test_cases() {
+       atf_add_test_case defaults__build_and_install
+}