From 81c2925d520efefc442099b324b9e564e79f9d40 Mon Sep 17 00:00:00 2001
From: Christian Brabandt <cb@256bit.org>
Date: Sun, 10 Sep 2023 18:43:14 +0200
Subject: [PATCH] CI qemu: Enable all tests again

---
 src/testdir/test_buffer.vim    |  2 +-
 src/testdir/test_crypt.vim     |  5 -----
 src/testdir/test_excmd.vim     |  3 ---
 src/testdir/test_functions.vim | 10 ++--------
 src/testdir/test_man.vim       |  3 ---
 src/testdir/test_startup.vim   |  3 ---
 src/testdir/test_stat.vim      |  1 -
 7 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/src/testdir/test_buffer.vim b/src/testdir/test_buffer.vim
index 56eaac96a024b..bc29c21621977 100644
--- a/src/testdir/test_buffer.vim
+++ b/src/testdir/test_buffer.vim
@@ -493,7 +493,7 @@ func Test_buflist_alloc_failure()
 
   " test for :checktime loading the buffer
   call writefile(['one'], 'XallocFail5', 'D')
-  if has('unix') && !CheckArch('s390x', v:false)
+  if has('unix')
     edit XallocFail5
     " sleep for some time to make sure the timestamp is different
     sleep 200m
diff --git a/src/testdir/test_crypt.vim b/src/testdir/test_crypt.vim
index 2eff29100dc40..e2eaed889da2f 100644
--- a/src/testdir/test_crypt.vim
+++ b/src/testdir/test_crypt.vim
@@ -178,9 +178,6 @@ endfunc
 
 func Test_uncrypt_xchacha20v2_custom()
   CheckFeature sodium
-  for arch in ['s390x', 'aarch64', 'riscv64']
-    exe "CheckArch "  .. arch
-  endfor
   " Test, reading xchacha20v2 with custom encryption parameters
   let hex =<< trim END
   00000000: 5669 6d43 7279 7074 7e30 3521 934b f288  VimCrypt~05!.K..
@@ -202,7 +199,6 @@ endfunc
 
 func Test_uncrypt_xchacha20v2()
   CheckFeature sodium
-  CheckArch s390x
   " Test, reading xchacha20v2
   let hex =<< trim END
   00000000: 5669 6d43 7279 7074 7e30 3521 9f20 4e14  VimCrypt~05!. N.
@@ -276,7 +272,6 @@ endfunc
 
 func Test_uncrypt_xchacha20v2_2()
   CheckFeature sodium
-  CheckArch s390x
 
   sp Xcrypt_sodium_v2.txt
   " Create a larger file, so that Vim will write in several blocks
diff --git a/src/testdir/test_excmd.vim b/src/testdir/test_excmd.vim
index dc70fb110b557..3637351f636c0 100644
--- a/src/testdir/test_excmd.vim
+++ b/src/testdir/test_excmd.vim
@@ -364,9 +364,6 @@ endfunc
 func Test_confirm_write_ro()
   CheckNotGui
   CheckRunVimInTerminal
-  for arch in ['s390x', 'aarch64', 'riscv64']
-    exe "CheckArch "  .. arch
-  endfor
 
   call writefile(['foo'], 'Xconfirm_write_ro', 'D')
   let lines =<< trim END
diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
index 8cd38558c4dc7..b14c5413f05a1 100644
--- a/src/testdir/test_functions.vim
+++ b/src/testdir/test_functions.vim
@@ -285,11 +285,8 @@ func Test_strftime()
   " are, a tzset(3) call may have failed somewhere
   call assert_equal(strlen(est), 2)
   call assert_equal(strlen(utc), 2)
-  " TODO: this fails on MS-Windows and Qemu Archs
-  if has('unix') &&
-    \ !CheckArch('riscv64', v:false) &&
-    \ !CheckArch('s390x', v:false)  &&
-    \ !CheckArch('aarch64', v:false)
+  " TODO: this fails on MS-Windows
+  if has('unix')
     call assert_notequal(est, utc)
   endif
 
@@ -2746,9 +2743,6 @@ func Test_readdir_sort()
 endfunc
 
 func Test_delete_rf()
-  for arch in ['s390x', 'aarch64', 'riscv64']
-    exe "CheckArch "  .. arch
-  endfor
   call mkdir('Xrfdir')
   call writefile([], 'Xrfdir/foo.txt')
   call writefile([], 'Xrfdir/bar.txt')
diff --git a/src/testdir/test_man.vim b/src/testdir/test_man.vim
index c4c613661ab8b..b4bac2c2f7433 100644
--- a/src/testdir/test_man.vim
+++ b/src/testdir/test_man.vim
@@ -135,9 +135,6 @@ endfunc
 
 " Check that underlying shell command arguments are escaped.
 func Test_Man_uses_shellescape()
-  for arch in ['s390x', 'aarch64', 'riscv64']
-    exe "CheckArch "  .. arch
-  endfor
   Man `touch\ Xbar` `touch\ Xfoo`
 
   redir => msg
diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim
index 55a72798eff36..949553350f099 100644
--- a/src/testdir/test_startup.vim
+++ b/src/testdir/test_startup.vim
@@ -1096,9 +1096,6 @@ func Test_redirect_Ctrl_C()
   CheckUnix
   CheckNotGui
   CheckRunVimInTerminal
-  for arch in ['s390x', 'aarch64']
-    exe "CheckArch "  .. arch
-  endfor
 
   let buf = Run_shell_in_terminal({})
   " Wait for the shell to display a prompt
diff --git a/src/testdir/test_stat.vim b/src/testdir/test_stat.vim
index 53d04369ca48e..ed123e4347183 100644
--- a/src/testdir/test_stat.vim
+++ b/src/testdir/test_stat.vim
@@ -92,7 +92,6 @@ endfunc
 
 func Test_autoread_fast()
   CheckFeature nanotime
-  CheckArch s390x
 
   " this is timing sensitive
   let g:test_is_flaky = 1