[src/trunk]: src/tests/usr.bin/cc Move common UBSAN test case code into ubsan...

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

details:   https://anonhg.NetBSD.org/src/rev/86379876f536
branches:  trunk
changeset: 996352:86379876f536
user:      mgorny <mgorny%NetBSD.org@localhost>
date:      Tue Jan 29 19:59:10 2019 +0000

description:
Move common UBSAN test case code into ubsan_common.subr

Reviewed by <kamil>

diffstat:

 tests/usr.bin/cc/Makefile                     |   18 +-
 tests/usr.bin/cc/t_ubsan_int_add_overflow.sh  |  171 +------------------------
 tests/usr.bin/cc/t_ubsan_int_divzero.sh       |  164 +-----------------------
 tests/usr.bin/cc/t_ubsan_int_neg_overflow.sh  |  170 +------------------------
 tests/usr.bin/cc/t_ubsan_int_sub_overflow.sh  |  171 +------------------------
 tests/usr.bin/cc/t_ubsan_vla_out_of_bounds.sh |  169 +------------------------
 tests/usr.bin/cc/ubsan_common.subr            |  162 ++++++++++++++++++++++++
 7 files changed, 227 insertions(+), 798 deletions(-)

diffs (truncated from 1152 to 300 lines):

diff -r 48ee32fbeeda -r 86379876f536 tests/usr.bin/cc/Makefile
--- a/tests/usr.bin/cc/Makefile Tue Jan 29 19:56:37 2019 +0000
+++ b/tests/usr.bin/cc/Makefile Tue Jan 29 19:59:10 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/01/29 19:56:37 mgorny Exp $
+# $NetBSD: Makefile,v 1.6 2019/01/29 19:59:10 mgorny Exp $
 
 .include <bsd.own.mk>
 
@@ -12,17 +12,23 @@
 ASAN_TESTS+=   t_asan_poison
 ASAN_TESTS+=   t_asan_uaf
 
+UBSAN_TESTS=   #
+UBSAN_TESTS+=  t_ubsan_int_add_overflow
+UBSAN_TESTS+=  t_ubsan_int_neg_overflow
+UBSAN_TESTS+=  t_ubsan_vla_out_of_bounds
+UBSAN_TESTS+=  t_ubsan_int_sub_overflow
+UBSAN_TESTS+=  t_ubsan_int_divzero
+
 TESTS_SH=      #
 TESTS_SH+=     $(ASAN_TESTS)
-TESTS_SH+=     t_ubsan_int_add_overflow
-TESTS_SH+=     t_ubsan_int_sub_overflow
-TESTS_SH+=     t_ubsan_int_neg_overflow
-TESTS_SH+=     t_ubsan_int_divzero
-TESTS_SH+=     t_ubsan_vla_out_of_bounds
+TESTS_SH+=     $(UBSAN_TESTS)
 TESTS_SH+=     t_hello
 
 .for test in ${ASAN_TESTS}
 TESTS_SH_SRC_${test}=  asan_common.subr ${test}.sh
 .endfor
+.for test in ${UBSAN_TESTS}
+TESTS_SH_SRC_${test}=  ubsan_common.subr ${test}.sh
+.endfor
 
 .include <bsd.test.mk>
diff -r 48ee32fbeeda -r 86379876f536 tests/usr.bin/cc/t_ubsan_int_add_overflow.sh
--- a/tests/usr.bin/cc/t_ubsan_int_add_overflow.sh      Tue Jan 29 19:56:37 2019 +0000
+++ b/tests/usr.bin/cc/t_ubsan_int_add_overflow.sh      Tue Jan 29 19:59:10 2019 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 The NetBSD Foundation, Inc.
+# Copyright (c) 2018, 2019 The NetBSD Foundation, Inc.
 # All rights reserved.
 #
 # This code is derived from software contributed to The NetBSD Foundation
@@ -26,172 +26,23 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-test_target()
-{
-       SUPPORT='n'
-       if ! echo __GNUC__ | cc -E - | grep -q __GNUC__; then
-               SUPPORT='y'
-       fi
-
-       if ! echo __clang__ | cc -E - | grep -q __clang__; then
-               SUPPORT='y'
-       fi
-}
-
-atf_test_case int_add_overflow
-int_add_overflow_head() {
-       atf_set "descr" "Test Undefined Behavior for int addition overflows"
-       atf_set "require.progs" "cc"
-}
-
-atf_test_case int_add_overflow_profile
-int_add_overflow_profile_head() {
-       atf_set "descr" "Test Undefined Behavior for int addition overflows with profiling option"
-       atf_set "require.progs" "cc"
-}
-atf_test_case int_add_overflow_pic
-int_add_overflow_pic_head() {
-       atf_set "descr" "Test Undefined Behavior for int addition overflows with position independent code (PIC) flag"
-       atf_set "require.progs" "cc"
-}
-atf_test_case int_add_overflow_pie
-int_add_overflow_pie_head() {
-       atf_set "descr" "Test Undefined Behavior for int addition overflows with position independent execution (PIE) flag"
-       atf_set "require.progs" "cc"
-}
-atf_test_case int_add_overflow32
-int_add_overflow32_head() {
-       atf_set "descr" "Test Undefined Behavior for int addition overflows in NetBSD_32 emulation"
-       atf_set "require.progs" "cc file diff cat"
-}
-
-
-int_add_overflow_body(){
-       cat > test.c << EOF
+UBSAN_CODE='
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
-int main(int argc, char **argv) {volatile int l = INT_MAX; l+=argc; return l;}
-EOF
-
-       cc -fsanitize=undefined -o test test.c
-       atf_check -e match:"signed integer overflow" ./test
-}
-
-int_add_overflow_profile_body(){
-       cat > test.c << EOF
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-int main(int argc, char **argv) {volatile int l = INT_MAX; l+=argc; return l;}
-EOF
-
-       cc -fsanitize=undefined -o test -pg test.c
-       atf_check -e match:"signed integer overflow" ./test
-}
-
-int_add_overflow_pic_body(){
-       cat > test.c << EOF
-#include <stdio.h>
-#include <stdlib.h>
 int help(int);
-int main(int argc, char **argv) {volatile int k = help(argc); return k;}
-EOF
-
-       cat > pic.c << EOF
-#include <stdlib.h>
-#include <stdio.h>
-#include <limits.h>
+#ifndef PIC_MAIN
 int help(int count) {volatile int l = INT_MAX; l+= count; return l;}
-EOF
-
-       cc -fsanitize=undefined -fPIC -shared -o libtest.so pic.c
-       cc -o test test.c -fsanitize=undefined -L. -ltest
-
-       export LD_LIBRARY_PATH=.
-       atf_check -e match:"signed integer overflow" ./test
-}
-
-int_add_overflow_pie_body(){
-
-       #check whether -pie flag is supported on this architecture
-       if ! cc -pie -dM -E - < /dev/null 2>/dev/null >/dev/null; then
-               atf_set_skip "cc -pie not supported on this architecture"
-       fi
-       cat > test.c << EOF
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-int main(int argc, char **argv) {volatile int l = INT_MAX; l+= argc; return l;}
-EOF
-
-       cc -fsanitize=undefined -o test -fpie -pie test.c
-       atf_check -e match:"signed integer overflow" ./test
-}
-
-
-int_add_overflow32_body(){
+#endif
+#ifndef PIC_FOO
+int main(int argc, char **argv) {volatile int l = INT_MAX; l+=argc; return l;}
+#endif
+'
 
-       # check what this architecture is, after all
-       if ! cc -dM -E - < /dev/null | grep -F -q _LP64; then
-               atf_skip "This is not a 64 bit architecture"
-       fi
-       if ! cc -m32 -dM -E - < /dev/null 2>/dev/null > ./def32; then
-               atf_skip "cc -m32 Not supported on this architecture"
-       else
-               if grep -F -q _LP64 ./def32; then
-               atf_fail "cc -m32 Does not generate NetBSD32 binaries"
-               fi
-       fi
-
-       cat > test.c << EOF
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-int main(int argc, char **argv) {volatile int l = INT_MAX; l+= argc; return l;}
-EOF
-
-       cc -fsanitize=undefined -o md32 -m32 test.c
-       cc -fsanitize=undefined -o md64 test.c
-       file -b ./md32 > ./ftype32
-       file -b ./md64 > ./ftype64
-       if diff ./ftype32 ./ftype64 >/dev/null; then
-               atf_fail "Generated 32bit binaries do not differ from 64bit ones"
-       fi
-       echo "32bit binaries on this platform are:"
-       cat ./ftype32
-       echo "64bit binaries are on the other hand:"
-       cat ./ftype64
-       atf_check -e match:"signed integer overflow" ./md32
-
-       # Another test with profile 32bit binaries, just to make sure everything has been thoroughly done
-       cat > test.c << EOF
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-int main(int argc, char **argv) {volatile int l = INT_MAX; l+= argc; return l;}
-EOF
-
-       cc -fsanitize=undefined -pg -m32 -o test test.c
-       atf_check -e match:"signed integer overflow" ./test
-}
-
-atf_test_case target_not_supported
-target_not_supported_head()
-{
-       atf_set "descr" "Test forced skip"
-}
+ubsan_test_case int_add_overflow "int addition overflows" \
+       "signed integer overflow"
 
 atf_init_test_cases()
 {
-       test_target
-       test $SUPPORT = 'n' && {
-               atf_add_test_case target_not_supported
-               return 0
-       }
-       atf_add_test_case int_add_overflow
-#      atf_add_test_case int_add_overflow_profile
-       atf_add_test_case int_add_overflow_pie
-       atf_add_test_case int_add_overflow_pic
-#      atf_add_test_case int_add_overflow32
+       ubsan_add_test_cases int_add_overflow
 }
diff -r 48ee32fbeeda -r 86379876f536 tests/usr.bin/cc/t_ubsan_int_divzero.sh
--- a/tests/usr.bin/cc/t_ubsan_int_divzero.sh   Tue Jan 29 19:56:37 2019 +0000
+++ b/tests/usr.bin/cc/t_ubsan_int_divzero.sh   Tue Jan 29 19:59:10 2019 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 The NetBSD Foundation, Inc.
+# Copyright (c) 2018, 2019 The NetBSD Foundation, Inc.
 # All rights reserved.
 #
 # This code is derived from software contributed to The NetBSD Foundation
@@ -26,165 +26,21 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-test_target()
-{
-       SUPPORT='n'
-       if ! echo __GNUC__ | cc -E - | grep -q __GNUC__; then 
-               SUPPORT='y'
-       fi
-
-       if ! echo __clang__ | cc -E - | grep -q __clang__; then 
-               SUPPORT='y'
-       fi
-}
-
-atf_test_case int_divzero
-int_divzero_head() {
-       atf_set "descr" "Test Undefined Behavior for int division with zero"
-       atf_set "require.progs" "cc"
-}
-
-atf_test_case int_divzero_profile
-int_divzero_profile_head() {
-       atf_set "descr" "Test Undefined Behavior for int division with zero with profiling option"
-       atf_set "require.progs" "cc"
-}
-atf_test_case int_divzero_pic
-int_divzero_pic_head() {
-       atf_set "descr" "Test Undefined Behavior for int division with zero with position independent code (PIC) flag"
-       atf_set "require.progs" "cc"
-}
-atf_test_case int_divzero_pie
-int_divzero_pie_head() {
-       atf_set "descr" "Test Undefined Behavior for int division with zero with position independent execution (PIE) flag"
-       atf_set "require.progs" "cc"
-}
-atf_test_case int_divzero32
-int_divzero32_head() {
-       atf_set "descr" "Test Undefined Behavior for int division with zero in NetBSD_32 emulation"
-       atf_set "require.progs" "cc file diff cat"
-}
-
-
-int_divzero_body(){
-       cat > test.c << EOF
-#include <stdio.h>
-#include <stdlib.h>
-int main(int argc, char **argv) {volatile int l = argc; volatile int k = 0; l/= k; return l;}
-EOF
-
-       cc -fsanitize=integer-divide-by-zero -o test test.c 
-       atf_check -s signal:8 -e match:"division by zero" ./test
-}
-
-int_divzero_profile_body(){
-       cat > test.c << EOF
-#include <stdio.h>
-#include <stdlib.h>
-int main(int argc, char **argv) {volatile int l = argc; volatile int k = 0; l/= k; return l;}
-EOF