Merge ~danilogondolfo/ubuntu/+source/vim:ppc64el_tests into ubuntu/+source/vim:ubuntu/devel

[Danilo Egea Gondolfo]

Some tests related to encryption and libsodium are failing in our infrastructure due to failures with mlock(). See https://launchpadlibrarian.net/681978158/buildlog_ubuntu-mantic-ppc64el.vim_2%3A9.0.1672-1ubuntu1_BUILDING.txt.gz

While I was testing it I noticed that the build might also fail on amd64 and arm64.

Apparently, upstream is facing the same issues in their Github workers, see https://github.com/vim/vim/commits/master/src/testdir/test_crypt.vim

I'm updating one of our distro patches to skip a few more tests to unblock vim.

[Sergio Durigan Junior (sergiodj)]

Thanks, Danilo.

Argh, these mlock problems are always fun. Anyway, I agree with the fix and am ready to sponsor it; I just would like you to add the bug number to the changelog entry so that it gets closed when the package migrates.

Thanks.

review: Needs Fixing

[Danilo Egea Gondolfo (danilogondolfo)]

Thank you, Sergio! I just added the LP bug to the changelog. I'll need to put a post-it note on my monitor so I'll not forget it for the 4th time in a row...

[Sergio Durigan Junior (sergiodj)]

Hah, that's a good idea :-).

I'm just waiting for the dep8 tests to finish running and will upload once everything is green.

[Sergio Durigan Junior (sergiodj)]

OK, amd64 and ppc64el dep8 tests have passed. I'm not waiting for the others because they take took long, and I was most curious about these two architectures anyway.

Uploaded:

$ dput vim_9.0.1672-1ubuntu2_source.changes
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/work/vim/vim_9.0.1672-1ubuntu2_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/vim/vim_9.0.1672-1ubuntu2.dsc: Valid signature from 106DA1C8C3CBBF14
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading vim_9.0.1672-1ubuntu2.dsc: done.
  Uploading vim_9.0.1672-1ubuntu2.debian.tar.xz: done.
  Uploading vim_9.0.1672-1ubuntu2_source.buildinfo: done.
  Uploading vim_9.0.1672-1ubuntu2_source.changes: done.
Successfully uploaded packages.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index b054457..b931f97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+vim (2:9.0.1672-1ubuntu2) mantic; urgency=medium
+
+  * debian/patches/0002-disable-failing-tests-on-ppc64.patch (LP: #2033072)
+    - Skip few more tests failing on ppc64el due to sodium_mlock().
+      Some of them also failed on arm64 and armd64 during tests with a PPA, so
+      skip them on those archs as well.
+
+ -- Danilo Egea Gondolfo <[e-mail]>  Fri, 25 Aug 2023 13:17:49 +0100
+
 vim (2:9.0.1672-1ubuntu1) mantic; urgency=low
 
   * Merge from Debian unstable. Remaining changes:
diff --git a/debian/patches/0002-disable-failing-tests-on-ppc64.patch b/debian/patches/0002-disable-failing-tests-on-ppc64.patch
index 06b7603..36355b7 100644
--- a/debian/patches/0002-disable-failing-tests-on-ppc64.patch
+++ b/debian/patches/0002-disable-failing-tests-on-ppc64.patch
@@ -1,14 +1,27 @@
-Description: Disable some tests on ppc64el
- A few of the build time tests were running into an ENOMEM issue on ppc64el.
- This patch skips the tests on ppc64el only.
+Description: Disable some tests on ppc64el, arm64 and amd64
+ A few of the build time tests were running into an ENOMEM issue on ppc64el,
+ arm64 and sometimes on amd64.
+ All the errors seem to be caused by sodium_mlock() trying to lock more memory than available.
+ This patch skips the tests on ppc64el and a subset of them in arm64 and amd64 only.
 Author: William 'jawn-smith' Wilson <[e-mail]>
 Author: Simon Quigley <[e-mail]>
-Last-Update: 2023-01-05
+Author: Danilo Egea Gondolfo <[e-mail]>
+Last-Update: 2023-08-25
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/src/testdir/test_crypt.vim
 +++ b/src/testdir/test_crypt.vim
-@@ -80,6 +80,9 @@ func Test_crypt_blowfish2()
+@@ -68,6 +68,9 @@
+ endfunc
+ 
+ func Test_crypt_zip()
++  if system("uname -m") == "ppc64le\n"
++    throw 'Skipped: not enough memory on ppc64le'
++  endif
+   call Crypt_uncrypt('zip')
+ endfunc
+ 
+@@ -80,16 +83,25 @@
  endfunc
  
  func Test_crypt_sodium()
@@ -18,17 +31,33 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
    CheckFeature sodium
    call Crypt_uncrypt('xchacha20')
  endfunc
-@@ -143,6 +146,9 @@ func Uncrypt_stable_xxd(method, hex, key
+ 
+ func Test_crypt_sodium_v2()
++  if system("uname -m") == "ppc64le\n"
++    throw 'Skipped: not enough memory on ppc64le'
++  endif
+   CheckFeature sodium
+   call Crypt_uncrypt('xchacha20v2')
  endfunc
  
- func Test_uncrypt_zip()
+ func Test_crypt_sodium_v2_startup()
 +  if system("uname -m") == "ppc64le\n"
 +    throw 'Skipped: not enough memory on ppc64le'
 +  endif
+   CheckFeature sodium
+   CheckRunVimInTerminal
+ 
+@@ -143,6 +155,9 @@
+ endfunc
+ 
+ func Test_uncrypt_zip()
++  if system("uname -m") == "ppc64le\n" || system("uname -m") == "aarch64\n"  || system("uname -m") == "x86_64\n"
++    throw 'Skipped: not enough memory on ppc64le and sometimes on arm64 and amd64'
++  endif
    call Uncrypt_stable('zip', "VimCrypt~01!\u0006\u001clV'\u00de}Mg\u00a0\u00ea\u00a3V\u00a9\u00e7\u0007E#3\u008e2U\u00e9\u0097", "foofoo", ["1234567890", "aábbccddeëff"])
  endfunc
  
-@@ -159,6 +165,9 @@ func Test_uncrypt_blowfish2()
+@@ -159,6 +174,9 @@
  endfunc
  
  func Test_uncrypt_xchacha20()
@@ -38,7 +67,27 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
    CheckFeature sodium
    let hex =<< trim END
    00000000: 5669 6d43 7279 7074 7e30 3421 6b7d e607  vimCrypt~04!k}..
-@@ -213,6 +222,9 @@ func Test_uncrypt_xchacha20v2()
+@@ -177,6 +195,9 @@
+ endfunc
+ 
+ func Test_uncrypt_xchacha20v2_custom()
++  if system("uname -m") == "ppc64le\n" || system("uname -m") == "aarch64\n" || system("uname -m") == "x86_64\n"
++    throw 'Skipped: not enough memory on ppc64le and sometimes on arm64 and amd64'
++  endif
+   CheckFeature sodium
+   " Test, reading xchacha20v2 with custom encryption parameters
+   let hex =<< trim END
+@@ -194,6 +215,9 @@
+ endfunc
+ 
+ func Test_uncrypt_xchacha20v2()
++  if system("uname -m") == "ppc64le\n"
++    throw 'Skipped: not enough memory on ppc64le'
++  endif
+   CheckFeature sodium
+   " Test, reading xchacha20v2
+   let hex =<< trim END
+@@ -213,6 +237,9 @@
  endfunc
  
  func Test_uncrypt_xchacha20_invalid()
@@ -48,7 +97,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
    CheckFeature sodium
  
    " load an invalid encrypted file and verify it can be decrypted with an
-@@ -232,6 +244,9 @@ func Test_uncrypt_xchacha20_invalid()
+@@ -232,6 +259,9 @@
  endfunc
  
  func Test_uncrypt_xchacha20_2()
@@ -58,7 +107,17 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
    CheckFeature sodium
  
    sp Xcrypt_sodium.txt
-@@ -291,6 +306,9 @@ func Test_uncrypt_xchacha20v2_2()
+@@ -261,6 +291,9 @@
+ endfunc
+ 
+ func Test_uncrypt_xchacha20v2_2()
++  if system("uname -m") == "ppc64le\n" || system("uname -m") == "aarch64\n" || system("uname -m") == "x86_64\n"
++    throw 'Skipped: not enough memory on ppc64le and sometimes on arm64 and amd64'
++  endif
+   CheckFeature sodium
+ 
+   sp Xcrypt_sodium_v2.txt
+@@ -291,6 +324,9 @@
  endfunc
  
  func Test_uncrypt_xchacha20_3_persistent_undo()
@@ -68,9 +127,19 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
    CheckFeature sodium
    CheckFeature persistent_undo
  
+@@ -393,6 +429,9 @@
+ endfunc
+ 
+ func Test_crypt_set_key_segfault()
++  if system("uname -m") == "ppc64le\n"
++    throw 'Skipped: not enough memory on ppc64le'
++  endif
+   CheckFeature sodium
+ 
+   defer delete('Xtest2.txt')
 --- a/src/testdir/test_quickfix.vim
 +++ b/src/testdir/test_quickfix.vim
-@@ -4255,6 +4255,9 @@ endfunc
+@@ -4255,6 +4255,9 @@
  
  " The following test used to crash Vim
  func Test_lvimgrep_crash()