svn commit: r313482 - in stable/10: contrib/netbsd-tests/lib/libc/ssp lib/libc/tests/ssp

[Ngie Cooper]

Author: ngie
Date: Thu Feb  9 21:29:18 2017
New Revision: 313482
URL: https://svnweb.freebsd.org/changeset/base/313482

Log:
  MFC r276527:
  
  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

Modified:
  stable/10/contrib/netbsd-tests/lib/libc/ssp/t_ssp.sh
  stable/10/lib/libc/tests/ssp/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/netbsd-tests/lib/libc/ssp/t_ssp.sh
==============================================================================
--- stable/10/contrib/netbsd-tests/lib/libc/ssp/t_ssp.sh	Thu Feb  9 21:26:14 2017	(r313481)
+++ stable/10/contrib/netbsd-tests/lib/libc/ssp/t_ssp.sh	Thu Feb  9 21:29:18 2017	(r313482)
@@ -361,6 +361,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: stable/10/lib/libc/tests/ssp/Makefile
==============================================================================
--- stable/10/lib/libc/tests/ssp/Makefile	Thu Feb  9 21:26:14 2017	(r313481)
+++ stable/10/lib/libc/tests/ssp/Makefile	Thu Feb  9 21:29:18 2017	(r313482)
@@ -26,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