2 files changed, 8 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index b2eae4be..f3a7e63d 100644
--- a/Makefile
+++ b/Makefile
@@ -384,6 +384,10 @@ TESTS_OK := $(addprefix tst/,\
                   $(patsubst %.txr,%.ok,\
                      $(wildcard $(addprefix tests/*/*.,txr tl)))))
 
+ifneq ($(have_ubsan),)
+TESTS_OK := $(filter-out %/012/stack.ok,$(TESTS_OK))
+endif
+
 .PHONY: tests
 tests: $(TESTS_OK)
 	$(V)echo "** tests passed!"
diff --git a/configure b/configure
index bd6d7a58..911ceca5 100755
--- a/configure
+++ b/configure
@@ -205,6 +205,7 @@ have_windres=
 have_posix_sigs=
 have_sockets=
 have_git=
+have_ubsan=
 have_pwuid=
 have_grgid=
 have_alloca=
@@ -956,6 +957,8 @@ EXE := $exe
 
 have_git := $have_git
 
+have_ubsan := $have_ubsan
+
 add_win_res := $([ -n "$have_windows_h" -a -n "$have_windres" ] && echo "y")
 
 TXR_CC := $cc
@@ -1224,6 +1227,7 @@ if conftest ; then
   if strings conftest | grep -q -i ubsan ; then
     printf "yes\n"
     printf "#define HAVE_UBSAN 1\n" >> config.h
+    have_ubsan=y
   else
     printf "no\n"
   fi