fixes 13

rafie · rafie · commit 99c81451b011 · 2021-12-28T18:33:46.000+02:00
diff --git a/tests/pytest/common.py b/tests/pytest/common.py
@@ -2,6 +2,10 @@
 from contextlib import contextmanager
 from includes import *
 
+SANITIZER = os.getenv('SANITIZER', '') # typically 'address' or 'memory'
+VALGRIND = os.getenv('VALGRIND', '0') == '1'
+CODE_COVERAGE = os.getenv('CODE_COVERAGE', '0') == '1'
+
 MEMINFO = os.getenv('MEMINFO', '0') == '1'
 SERDE_JSON = os.getenv('SERDE_JSON', '0') == '1'
 
diff --git a/tests/pytest/test_mem.py b/tests/pytest/test_mem.py
@@ -30,7 +30,7 @@ def __del__(self):
     def testKeys(self):
         env = self.env
         env.skipOnCluster()
-        if env.useAof or env.useSlaves:
+        if env.useAof or env.useSlaves or SANITIZER != '':
             env.skip()
 
         def add_and_check(title):
@@ -60,7 +60,7 @@ def delete():
     def testFields(self):
         env = self.env
         env.skipOnCluster()
-        if env.useAof or env.useSlaves:
+        if env.useAof or env.useSlaves or SANITIZER != '':
             env.skip()
 
         def add_and_check(title):
diff --git a/tests/pytest/tests.sh b/tests/pytest/tests.sh
@@ -54,7 +54,7 @@ install_git_lfs() {
 
 setup_redis_server() {
 	if [[ -n $SAN ]]; then
-		if [[ $SAN == addr || $SAN == address ]]; then
+		if [[ $SAN == address ]]; then
 			REDIS_SERVER=${REDIS_SERVER:-redis-server-asan-6.2}
 			if ! command -v $REDIS_SERVER > /dev/null; then
 				echo Building Redis for clang-asan ...
@@ -64,7 +64,7 @@ setup_redis_server() {
 			export ASAN_OPTIONS=detect_odr_violation=0
 			# :detect_leaks=0
 
-		elif [[ $SAN == mem || $SAN == memory ]]; then
+		elif [[ $SAN == memory ]]; then
 			REDIS_SERVER=${REDIS_SERVER:-redis-server-msan-6.2}
 			if ! command -v $REDIS_SERVER > /dev/null; then
 				echo Building Redis for clang-msan ...
@@ -92,6 +92,8 @@ setup_redis_server() {
 #----------------------------------------------------------------------------------------------
 
 valgrind_config() {
+	export VALGRIND=1 # for RLTest
+
 	export VG_OPTIONS="
 		-q \
 		--leak-check=full \
@@ -245,6 +247,11 @@ fi
 
 export OS=$($READIES/bin/platform --os)
 
+if [[ -n $SAN ]]; then
+	# for RLTest
+	export SANITIZER="$SAN"
+fi
+
 #----------------------------------------------------------------------------------------------
 
 cd $ROOT/tests/pytest
