Module Name: src Committed By: kamil Date: Sun May 14 01:03:21 UTC 2017
Modified Files: src/distrib/sets/lists/tests: mi src/tests/usr.bin/c++: Makefile Added Files: src/tests/usr.bin/c++: t_cxxruntime.sh Log Message: Add new ATF C++ tests in usr.bin/c++ These tests are cloned from t_hello and use c++ runtime basic functions. Added tests: - hello - hello_pic - hello_pie - hello32 To generate a diff of this commit: cvs rdiff -u -r1.739 -r1.740 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/c++/Makefile cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/c++/t_cxxruntime.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.739 src/distrib/sets/lists/tests/mi:1.740 --- src/distrib/sets/lists/tests/mi:1.739 Sun May 14 00:07:07 2017 +++ src/distrib/sets/lists/tests/mi Sun May 14 01:03:21 2017 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.739 2017/05/14 00:07:07 kamil Exp $ +# $NetBSD: mi,v 1.740 2017/05/14 01:03:21 kamil Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -3587,6 +3587,7 @@ ./usr/tests/usr.bin/c++ tests-usr.bin-tests compattestfile,atf,cxx ./usr/tests/usr.bin/c++/Atffile tests-usr.bin-tests compattestfile,atf,cxx ./usr/tests/usr.bin/c++/Kyuafile tests-usr.bin-tests compattestfile,atf,kyua,cxx +./usr/tests/usr.bin/c++/t_cxxruntime tests-usr.bin-tests compattestfile,atf,cxx ./usr/tests/usr.bin/c++/t_hello tests-usr.bin-tests compattestfile,atf,cxx ./usr/tests/usr.bin/cc tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/cc/Atffile tests-usr.bin-tests compattestfile,atf Index: src/tests/usr.bin/c++/Makefile diff -u src/tests/usr.bin/c++/Makefile:1.1 src/tests/usr.bin/c++/Makefile:1.2 --- src/tests/usr.bin/c++/Makefile:1.1 Sun May 14 00:07:07 2017 +++ src/tests/usr.bin/c++/Makefile Sun May 14 01:03:21 2017 @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.1 2017/05/14 00:07:07 kamil Exp $ +# $NetBSD: Makefile,v 1.2 2017/05/14 01:03:21 kamil Exp $ .include <bsd.own.mk> TESTSDIR= ${TESTSBASE}/usr.bin/c++ -TESTS_SH= t_hello +TESTS_SH= t_cxxruntime +TESTS_SH+= t_hello .include <bsd.test.mk> Added files: Index: src/tests/usr.bin/c++/t_cxxruntime.sh diff -u /dev/null src/tests/usr.bin/c++/t_cxxruntime.sh:1.1 --- /dev/null Sun May 14 01:03:21 2017 +++ src/tests/usr.bin/c++/t_cxxruntime.sh Sun May 14 01:03:21 2017 @@ -0,0 +1,148 @@ +# $NetBSD: t_cxxruntime.sh,v 1.1 2017/05/14 01:03:21 kamil Exp $ +# +# Copyright (c) 2017 The NetBSD Foundation, Inc. +# All rights reserved. +# +# This code is derived from software contributed to The NetBSD Foundation +# by Kamil Rytarowski. +# +# 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 cxxruntime +cxxruntime_head() { + atf_set "descr" "compile and run \"hello world\"" + atf_set "require.progs" "c++" +} + +atf_test_case cxxruntime_pic +cxxruntime_pic_head() { + atf_set "descr" "compile and run PIC \"hello world\"" + atf_set "require.progs" "c++" +} + +atf_test_case cxxruntime_pie +cxxruntime_pie_head() { + atf_set "descr" "compile and run position independent (PIE) \"hello world\"" + atf_set "require.progs" "c++" +} + +atf_test_case cxxruntime32 +cxxruntime32_head() { + atf_set "descr" "compile and run \"hello world\" for/in netbsd32 emulation" + atf_set "require.progs" "c++ file diff cat" +} + +cxxruntime_body() { + cat > test.cpp << EOF +#include <cstdlib> +#include <iostream> +int main(void) {std::cout << "hello world" << std::endl;exit(0);} +EOF + atf_check -s exit:0 -o ignore -e ignore c++ -o hello test.cpp + atf_check -s exit:0 -o inline:"hello world\n" ./hello +} + +cxxruntime_pic_body() { + cat > test.cpp << EOF +#include <cstdlib> +int callpic(void); +int main(void) {callpic();exit(0);} +EOF + cat > pic.cpp << EOF +#include <iostream> +int callpic(void) {std::cout << "hello world" << std::endl;return 0;} +EOF + + atf_check -s exit:0 -o ignore -e ignore \ + c++ -fPIC -shared -o libtest.so pic.cpp + atf_check -s exit:0 -o ignore -e ignore \ + c++ -o hello test.cpp -L. -ltest + + export LD_LIBRARY_PATH=. + atf_check -s exit:0 -o inline:"hello world\n" ./hello +} + +cxxruntime_pie_body() { + # check whether this arch supports -pie + if ! c++ -pie -dM -E - < /dev/null 2>/dev/null >/dev/null; then + atf_skip "c++ -pie not supported on this architecture" + fi + cat > test.cpp << EOF +#include <cstdlib> +#include <iostream> +int main(void) {std::cout << "hello world" << std::endl;exit(0);} +EOF + atf_check -s exit:0 -o ignore -e ignore c++ -fpie -pie -o hello test.cpp + atf_check -s exit:0 -o inline:"hello world\n" ./hello +} + +cxxruntime32_body() { + # check whether this arch is 64bit + if ! c++ -dM -E - < /dev/null | fgrep -q _LP64; then + atf_skip "this is not a 64 bit architecture" + fi + if ! c++ -m32 -dM -E - < /dev/null 2>/dev/null > ./def32; then + atf_skip "c++ -m32 not supported on this architecture" + else + if fgrep -q _LP64 ./def32; then + atf_fail "c++ -m32 does not generate netbsd32 binaries" + fi + fi + + cat > test.cpp << EOF +#include <stdio.h> +#include <stdlib.h> +int main(void) {printf("hello world\n");exit(0);} +EOF + atf_check -s exit:0 -o ignore -e ignore c++ -o hello32 -m32 test.cpp + atf_check -s exit:0 -o ignore -e ignore c++ -o hello64 test.cpp + file -b ./hello32 > ./ftype32 + file -b ./hello64 > ./ftype64 + if diff ./ftype32 ./ftype64 >/dev/null; then + atf_fail "generated binaries do not differ" + fi + echo "32bit binaries on this platform are:" + cat ./ftype32 + echo "While native (64bit) binaries are:" + cat ./ftype64 + atf_check -s exit:0 -o inline:"hello world\n" ./hello32 + + # do another test with static 32bit binaries + cat > test.cpp << EOF +#include <iostream> +#include <cstdlib> +int main(void) {std::cout << "hello static world" << std::endl;exit(0);} +EOF + atf_check -s exit:0 -o ignore -e ignore c++ -o hello -m32 \ + -static test.cpp + atf_check -s exit:0 -o inline:"hello static world\n" ./hello +} + +atf_init_test_cases() +{ + + atf_add_test_case cxxruntime + atf_add_test_case cxxruntime_pic + atf_add_test_case cxxruntime_pie + atf_add_test_case cxxruntime32 +}