diff options
| author | ngie <ngie@FreeBSD.org> | 2015-01-02 05:40:02 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2015-01-02 05:40:02 +0000 |
| commit | 3d2a537705eca33db3c523f4f92290d382aa7ab1 (patch) | |
| tree | 06ab08d87655ab0caab6cf37e88b7b9e4b0be77b | |
| parent | 445e8d91edc50978571dd8bff752e46840455569 (diff) | |
| download | FreeBSD-src-3d2a537705eca33db3c523f4f92290d382aa7ab1.zip FreeBSD-src-3d2a537705eca33db3c523f4f92290d382aa7ab1.tar.gz | |
Don't install h_raw if dealing with clang 3.5.0+ to unbreak the tests2 Jenkins
job
The h_raw application doesn't do proper bounds checking without the option
being supplied via the build, which means that it doesn't throw signals and
fail as expected
PR: 196430
X-MFC with: r276479
| -rwxr-xr-x | contrib/netbsd-tests/lib/libc/ssp/t_ssp.sh | 3 | ||||
| -rw-r--r-- | lib/libc/tests/ssp/Makefile | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/contrib/netbsd-tests/lib/libc/ssp/t_ssp.sh b/contrib/netbsd-tests/lib/libc/ssp/t_ssp.sh index 04adc67..362178f 100755 --- a/contrib/netbsd-tests/lib/libc/ssp/t_ssp.sh +++ b/contrib/netbsd-tests/lib/libc/ssp/t_ssp.sh @@ -360,6 +360,9 @@ raw_head() raw_body() { prog="$(atf_get_srcdir)/h_raw" + # Begin FreeBSD + [ -x $prog ] || atf_skip "$prog is missing; skipping testcase" + # End FreeBSD h_pass "$prog 9" # Begin FreeBSD diff --git a/lib/libc/tests/ssp/Makefile b/lib/libc/tests/ssp/Makefile index 1649cc2..7bc8660 100644 --- a/lib/libc/tests/ssp/Makefile +++ b/lib/libc/tests/ssp/Makefile @@ -9,10 +9,7 @@ WARNS?= 2 CFLAGS.h_raw+= -fstack-protector-all -Wstack-protector .if ${COMPILER_TYPE} == "clang" -# Disable -fsanitize=bounds until runtime support is done for clang 3.5.0. -.if ${COMPILER_VERSION} < 30500 CFLAGS.h_raw+= -fsanitize=bounds -.endif .elif ${COMPILER_TYPE} == "gcc" CFLAGS.h_raw+= --param ssp-buffer-size=1 DPADD+= ${LIBSSP} @@ -29,7 +26,11 @@ PROGS+= h_getcwd PROGS+= h_memcpy PROGS+= h_memmove PROGS+= h_memset +# This testcase doesn't run properly when not compiled with -fsantize=bounds +# with clang, which is currently contingent on a compiler_rt update +.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} < 30500 PROGS+= h_raw +.endif PROGS+= h_read PROGS+= h_readlink PROGS+= h_snprintf |
