Author: ngie
Date: Fri Jan 2 05:40:02 2015
New Revision: 276527
URL: https://svnweb.freebsd.org/changeset/base/276527
Log:
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
Modified:
head/contrib/netbsd-tests/lib/libc/ssp/t_ssp.sh
head/lib/libc/tests/ssp/Makefile
Modified: head/contrib/netbsd-tests/lib/libc/ssp/t_ssp.sh
==============================================================================
--- head/contrib/netbsd-tests/lib/libc/ssp/t_ssp.sh Fri Jan 2 05:34:14
2015 (r276526)
+++ head/contrib/netbsd-tests/lib/libc/ssp/t_ssp.sh Fri Jan 2 05:40:02
2015 (r276527)
@@ -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
Modified: head/lib/libc/tests/ssp/Makefile
==============================================================================
--- head/lib/libc/tests/ssp/Makefile Fri Jan 2 05:34:14 2015
(r276526)
+++ head/lib/libc/tests/ssp/Makefile Fri Jan 2 05:40:02 2015
(r276527)
@@ -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
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
