summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2022-08-06 15:06:22 +0300
committerMonty <monty@mariadb.org>2022-08-08 11:19:55 +0300
commit4a53253cf9aff82ad9066b13702181a34edc2749 (patch)
tree6da194093d9d1d245fba9aeff6ae6873af295482
parenta5a9fcdfe44ffb093887a255254d128fe3752fd1 (diff)
downloadmariadb-git-4a53253cf9aff82ad9066b13702181a34edc2749.tar.gz
Fixed that sp-no-valgrind.test is disabled on valgrind builds (not runs)
-rw-r--r--mysql-test/include/not_valgrind_build.inc4
-rw-r--r--mysql-test/main/sp-no-valgrind.test2
2 files changed, 5 insertions, 1 deletions
diff --git a/mysql-test/include/not_valgrind_build.inc b/mysql-test/include/not_valgrind_build.inc
new file mode 100644
index 00000000000..2b60f11bfc7
--- /dev/null
+++ b/mysql-test/include/not_valgrind_build.inc
@@ -0,0 +1,4 @@
+if (`select version() like '%valgrind%'`)
+{
+ skip Does not run with binaries built with valgrind;
+}
diff --git a/mysql-test/main/sp-no-valgrind.test b/mysql-test/main/sp-no-valgrind.test
index 89f8250bf72..21e52f2d3d5 100644
--- a/mysql-test/main/sp-no-valgrind.test
+++ b/mysql-test/main/sp-no-valgrind.test
@@ -1,5 +1,5 @@
---source include/not_valgrind.inc
+--source include/not_valgrind_build.inc
--echo # MDEV-20699 do not cache SP in SHOW CREATE
--echo # Warmup round, this might allocate some memory for session variable