From f94a8773711b2d30924ae0073d2233c1400dce3c Mon Sep 17 00:00:00 2001
From: mc964203886 <machi@iscas.ac.cn>
Date: Tue, 14 Dec 2021 10:44:25 +0800
Subject: [PATCH 1/2] spec:fix timeout

---
 mariadb.spec | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/mariadb.spec b/mariadb.spec
index acbf648..677b176 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -1048,6 +1048,7 @@ rm %{buildroot}%{_mandir}/man1/aria_s3_copy.1*
 %check
 %if %{with test}
 %if %runselftest
+%ifnarch riscv64
 # hack to let 32- and 64-bit tests run concurrently on same build machine
 export MTR_PARALLEL=1
 export MTR_BUILD_THREAD=$(( $(date +%s) % 1100 ))
@@ -1088,6 +1089,49 @@ export MTR_BUILD_THREAD=$(( $(date +%s) % 1100 ))
   rm -rf ./var
 )
 
+# NOTE: the Spider SE has 2 more hidden testsuites "oracle" and "oracle2".
+#       however, all of the tests fail with: "failed: 12521: Can't use wrapper 'oracle' for SQL connection"
+%else
+# hack to let 32- and 64-bit tests run concurrently on same build machine
+export MTR_PARALLEL=1
+export MTR_BUILD_THREAD=$(( $(date +%s) % 1100 ))
+
+(
+  set -ex
+  cd %{buildroot}%{_datadir}/mysql-test
+
+  export common_testsuite_arguments=" --parallel=auto --force --retry=2 --suite-timeout=4500 --testcase-timeout=150 --mysqld=--binlog-format=mixed --force-restart --shutdown-timeout=300 --max-test-fail=5 "
+
+  # If full testsuite has already been run on this version and we don't explicitly want the full testsuite to be run
+  if [[ "%{last_tested_version}" == "%{version}" ]] && [[ %{force_run_testsuite} -eq 0 ]]
+  then
+    # in further rebuilds only run the basic "main" suite (~800 tests)
+    echo "running only base testsuite"
+    perl ./mysql-test-run.pl $common_testsuite_arguments --ssl --suite=main --mem --skip-test-list=unstable-tests
+  fi
+
+  # If either this version wasn't marked as tested yet or I explicitly want to run the testsuite, run everything we have (~4000 test)
+  if [[ "%{last_tested_version}" != "%{version}" ]] || [[ %{force_run_testsuite} -ne 0 ]]
+  then
+    echo "running advanced testsuite"
+    perl ./mysql-test-run.pl $common_testsuite_arguments --ssl --big-test --skip-test=spider \
+    %if %{ignore_testsuite_result}
+      --max-test-fail=9999 || :
+    %else
+      --skip-test-list=unstable-tests
+    %endif
+    # Second run for the SPIDER suites that fail with SCA (ssl self signed certificate)
+    perl ./mysql-test-run.pl $common_testsuite_arguments --skip-ssl --big-test --mem --suite=spider,spider/bg,spider/bugfix,spider/handler \
+    %if %{ignore_testsuite_result}
+      --max-test-fail=999 || :
+    %endif
+  # blank line
+  fi
+
+  # There might be a dangling symlink left from the testing, remove it to not be installed
+  rm -rf ./var
+)
+
 # NOTE: the Spider SE has 2 more hidden testsuites "oracle" and "oracle2".
 #       however, all of the tests fail with: "failed: 12521: Can't use wrapper 'oracle' for SQL connection"
 
-- 
Gitee


From df23c82eddcc8d11e3fff85f7f46a289a474160b Mon Sep 17 00:00:00 2001
From: mc964203886 <machi@iscas.ac.cn>
Date: Tue, 14 Dec 2021 10:54:30 +0800
Subject: [PATCH 2/2] spec:fix timeout

---
 mariadb.spec | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mariadb.spec b/mariadb.spec
index 677b176..9a8e2d0 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -1088,7 +1088,6 @@ export MTR_BUILD_THREAD=$(( $(date +%s) % 1100 ))
   # There might be a dangling symlink left from the testing, remove it to not be installed
   rm -rf ./var
 )
-
 # NOTE: the Spider SE has 2 more hidden testsuites "oracle" and "oracle2".
 #       however, all of the tests fail with: "failed: 12521: Can't use wrapper 'oracle' for SQL connection"
 %else
@@ -1134,7 +1133,7 @@ export MTR_BUILD_THREAD=$(( $(date +%s) % 1100 ))
 
 # NOTE: the Spider SE has 2 more hidden testsuites "oracle" and "oracle2".
 #       however, all of the tests fail with: "failed: 12521: Can't use wrapper 'oracle' for SQL connection"
-
+%endif
 %endif
 %endif
 
-- 
Gitee