diff --git a/main/postmarketos-initramfs/APKBUILD b/main/postmarketos-initramfs/APKBUILD index 40186e7d3..985d39c81 100644 --- a/main/postmarketos-initramfs/APKBUILD +++ b/main/postmarketos-initramfs/APKBUILD @@ -2,12 +2,12 @@ maintainer="Casey Connolly " pkgname=postmarketos-initramfs pkgver=3.12.3 -pkgrel=0 +pkgrel=1 pkgdesc="Base files for the postmarketOS initramfs / initramfs-extra" url="https://postmarketos.org" -options="!check" # no tests provides="postmarketos-ramdisk=$pkgver-r$pkgrel" provider_priority=10 +checkdepends="postmarketos-testlib" depends=" beebzzr blkid @@ -50,6 +50,8 @@ source=" init_2nd.sh init_functions_2nd.sh mdev.conf + tests/01-parse-cmdline-testlib.sh + tests/02-find-partition-testlib.sh " arch="noarch" license="GPL-2.0-or-later" @@ -62,6 +64,10 @@ build() { "$srcdir/init.sh" > "$builddir/init.sh" } +check() { + postmarketos-testlib "$srcdir" +} + package() { install -Dm644 "$srcdir"/mdev.conf \ -t "$pkgdir"/usr/share/initramfs/ @@ -116,4 +122,6 @@ bd72e8b6345a46ec13516c64d78d4fa1a9a18a8db9ab04aac605f9708629453dc65b6fbccd96b58e 7aa82d5e2907470d667612643d98371dff27b2650051f8c568ab43d1b97677362c3e6fbd442474086d681ea7c0cfbcaf269d3eef2d2dc3ff4ebf17c786b82148 init_2nd.sh 59f1e8954483dfe49182ddbaf0c1a4741f147161b92b5bb836e5bd405b419438f5757915546b46b846193c5a4b44c4b1a523f0ad0dcb87a1dfcaed9360e03146 init_functions_2nd.sh 675e7d5bee39b2df7d322117f8dcaccc274d61beaf4d50ead19bbf2109446d64b1c0aa0c5b4f9846eb6c1c403418f28f6364eff4537ba41120fbfcbc484b7da7 mdev.conf +776ac842df70a5ac7b20b942abf2afecfed83b59bd5bf775b77c1e8e071e1d9b9120c502410cd2643551589e9523221be0ca7a2734b2c5302fca7d631aa91916 01-parse-cmdline-testlib.sh +a60b8affe7431d477f7480ca094721930f65a31f920c7eb937384ad708f98a4a4ab2ad68688bf92ff741d3083ce4f14c238ee2e1beae5cefc30b5fd9bfd6aa66 02-find-partition-testlib.sh " diff --git a/main/postmarketos-initramfs/tests/.gitlab-ci.yml b/main/postmarketos-initramfs/tests/.gitlab-ci.yml deleted file mode 100644 index 966f95adb..000000000 --- a/main/postmarketos-initramfs/tests/.gitlab-ci.yml +++ /dev/null @@ -1,9 +0,0 @@ - -initramfs-unit-tests: - extends: .package-test - script: - - .ci/lib/testlib.sh main/postmarketos-initramfs/tests - rules: - - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false" - changes: - - main/postmarketos-initramfs/*.sh diff --git a/main/postmarketos-initramfs/tests/01-parse-cmdline.sh b/main/postmarketos-initramfs/tests/01-parse-cmdline-testlib.sh similarity index 100% rename from main/postmarketos-initramfs/tests/01-parse-cmdline.sh rename to main/postmarketos-initramfs/tests/01-parse-cmdline-testlib.sh diff --git a/main/postmarketos-initramfs/tests/02-find-partition.sh b/main/postmarketos-initramfs/tests/02-find-partition-testlib.sh similarity index 100% rename from main/postmarketos-initramfs/tests/02-find-partition.sh rename to main/postmarketos-initramfs/tests/02-find-partition-testlib.sh