From f6fb85d7d351c2888ff3a5e9e414fb9cf65bb26e Mon Sep 17 00:00:00 2001
From: Peter Dimov <pdimov@gmail.com>
Date: Sun, 13 Jun 2021 04:59:49 +0300
Subject: [PATCH] Revert "Update Travis to use undefined-sanitizer; disable
 failed_constexpr_test"

This reverts commit c069ae048f0661de4f9c9568621e6c6a59dc7db9.
---
 .travis.yml     | 2 +-
 test/Jamfile.v2 | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index eca1eea..fc05f55 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -206,7 +206,7 @@ install:
 script:
   - |-
     echo "using $TOOLSET : : $COMPILER ;" > ~/user-config.jam
-  - ./b2 -j3 libs/system/test toolset=$TOOLSET cxxstd=$CXXSTD variant=debug,release ${ADDRMD:+address-model=$ADDRMD} ${UBSAN:+undefined-sanitizer=norecover define=UBSAN=1 debug-symbols=on} ${LINKFLAGS:+linkflags=$LINKFLAGS}
+  - ./b2 -j3 libs/system/test toolset=$TOOLSET cxxstd=$CXXSTD variant=debug,release ${ADDRMD:+address-model=$ADDRMD} ${UBSAN:+cxxflags=-fsanitize=undefined cxxflags=-fno-sanitize-recover=undefined linkflags=-fsanitize=undefined define=UBSAN=1 debug-symbols=on} ${LINKFLAGS:+linkflags=$LINKFLAGS}
 
 notifications:
   email:
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 4e9ba32..5ae8090 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -56,8 +56,7 @@ system-run generic_category_test.cpp ;
 system-run system_category_test.cpp ;
 system-run after_main_test.cpp ;
 system-run failed_test.cpp ;
-compile failed_constexpr_test.cpp
-  : <toolset>gcc,<undefined-sanitizer>norecover:<build>no ;
+system-run failed_constexpr_test.cpp ;
 
 # Quick (CI) test
 run quick.cpp ;