From: Anton Mikanovich <amikan@ilbers.de>
To: isar-users@googlegroups.com
Cc: Anton Mikanovich <amikan@ilbers.de>
Subject: [PATCH v2 17/18] CI: Adopt tests to syntax change
Date: Fri, 15 Jul 2022 09:04:41 +0300 [thread overview]
Message-ID: <20220715060442.18063-18-amikan@ilbers.de> (raw)
In-Reply-To: <20220715060442.18063-1-amikan@ilbers.de>
Change override syntax inside test cases.
Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
testsuite/cibuilder.py | 8 ++++----
testsuite/citest.py | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py
index dfb0a37..3a2e7e3 100755
--- a/testsuite/cibuilder.py
+++ b/testsuite/cibuilder.py
@@ -89,9 +89,9 @@ class CIBuilder(Test):
# write ci_build.conf
with open(self.build_dir + '/conf/ci_build.conf', 'w') as f:
if compat_arch:
- f.write('ISAR_ENABLE_COMPAT_ARCH_amd64 = "1"\n')
- f.write('ISAR_ENABLE_COMPAT_ARCH_arm64 = "1"\n')
- f.write('ISAR_ENABLE_COMPAT_ARCH_debian-stretch_amd64 = "0"\n')
+ f.write('ISAR_ENABLE_COMPAT_ARCH:amd64 = "1"\n')
+ f.write('ISAR_ENABLE_COMPAT_ARCH:arm64 = "1"\n')
+ f.write('ISAR_ENABLE_COMPAT_ARCH:debian-stretch:amd64 = "0"\n')
f.write('IMAGE_INSTALL += "kselftest"\n')
if cross:
f.write('ISAR_CROSS_COMPILE = "1"\n')
@@ -102,7 +102,7 @@ class CIBuilder(Test):
f.write('BB_NO_NETWORK = "1"\n')
if container:
f.write('SDK_FORMATS = "docker-archive"\n')
- f.write('IMAGE_INSTALL_remove = "example-module-${KERNEL_NAME} enable-fsck"\n')
+ f.write('IMAGE_INSTALL:remove = "example-module-${KERNEL_NAME} enable-fsck"\n')
if gpg_pub_key:
f.write('BASE_REPO_KEY="file://' + gpg_pub_key + '"\n')
if distro_apt_premir:
diff --git a/testsuite/citest.py b/testsuite/citest.py
index 6c8eb26..7881330 100755
--- a/testsuite/citest.py
+++ b/testsuite/citest.py
@@ -216,7 +216,7 @@ class RebuildTest(CIBaseTest):
self.backupfile(dpkgbase_file)
with open(dpkgbase_file, 'a') as file:
- file.write('do_fetch_append() {\n\n}')
+ file.write('do_fetch:append() {\n\n}')
try:
self.perform_build_test('mc:qemuamd64-bullseye:isar-image-base', debsrc_cache=True)
--
2.17.1
next prev parent reply other threads:[~2022-07-15 6:05 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-15 6:04 [PATCH v2 00/18] Migrate to Bitbake 2.0 Anton Mikanovich
2022-07-15 6:04 ` [PATCH v2 01/18] meta: change deprecated parse calls Anton Mikanovich
2022-07-15 6:04 ` [PATCH v2 02/18] scripts/contrib: Add override conversion script Anton Mikanovich
2022-07-15 6:04 ` [PATCH v2 03/18] scripts/contrib: configure " Anton Mikanovich
2022-07-15 6:04 ` [PATCH v2 04/18] meta-isar: set default branch names Anton Mikanovich
2022-07-15 6:04 ` [PATCH v2 05/18] meta: remove non recommended syntax Anton Mikanovich
2022-07-15 6:04 ` [PATCH v2 06/18] bitbake: Update to Bitbake 2.0.1 Anton Mikanovich
2022-07-15 6:04 ` [PATCH v2 07/18] doc: require zstd tool Anton Mikanovich
2022-07-15 6:04 ` [PATCH v2 08/18] meta: update bitbake variables Anton Mikanovich
2022-07-15 6:04 ` [PATCH v2 09/18] bitbake.conf: align hash vars with openembedded Anton Mikanovich
2022-07-15 6:04 ` [PATCH v2 10/18] meta: mark network and sudo tasks Anton Mikanovich
2022-07-15 6:04 ` [PATCH v2 11/18] meta: update overrides syntax Anton Mikanovich
2022-07-15 6:04 ` [PATCH v2 12/18] sstate: update bbclass Anton Mikanovich
2022-07-15 6:04 ` [PATCH v2 13/18] bitbake.conf: declare default XZ and ZSTD options Anton Mikanovich
2022-07-15 6:04 ` [PATCH v2 14/18] Revert "devshell: Use different termination test to avoid warnings" Anton Mikanovich
2022-07-15 6:04 ` [PATCH v2 15/18] meta: align with OE-core libraries update Anton Mikanovich
2022-07-15 6:04 ` [PATCH v2 16/18] Revert "Revert "devshell: Use different termination test to avoid warnings"" Anton Mikanovich
2022-07-15 6:04 ` Anton Mikanovich [this message]
2022-07-15 6:04 ` [PATCH v2 18/18] isar-sstate: adopt sstate maintenance script Anton Mikanovich
2022-07-19 11:36 ` [PATCH v2 00/18] Migrate to Bitbake 2.0 Schmidt, Adriaan
2022-07-19 13:09 ` Anton Mikanovich
2022-07-20 5:26 ` Schmidt, Adriaan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220715060442.18063-18-amikan@ilbers.de \
--to=amikan@ilbers.de \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox