From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7236574603632443392 X-Received: by 2002:a17:902:ecd0:b0:1a5:2540:729 with SMTP id a16-20020a170902ecd000b001a525400729mr17082747plh.56.1684896322758; Tue, 23 May 2023 19:45:22 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:903:27c5:b0:1a5:262e:fa42 with SMTP id km5-20020a17090327c500b001a5262efa42ls332185plb.1.-pod-prod-07-us; Tue, 23 May 2023 19:45:21 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7/OJ4+rguGGhLolRD4r9O49nuSFJLv6XFPA1+Cyb9T+6DM1r8ierYuWDw6vNVUzL9tVdcd X-Received: by 2002:a17:902:6505:b0:1ac:40f7:8b52 with SMTP id b5-20020a170902650500b001ac40f78b52mr13569206plk.64.1684896321716; Tue, 23 May 2023 19:45:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684896321; cv=none; d=google.com; s=arc-20160816; b=w94suyfsI2LRtK16jVPLCEoyKmJsqsO4Q9G6LWMHXmR+MURINHZm6svJI7fG7C+ZKt swcu1EUFB4kflQpmx1YwrYwewEtDY1pRkOa4czm6mEHpsOgY9beC7h7/RhNCxIJ8RVRC 9vH+kTWJcNlb5D/4aOO9WG0nkBpEentOmTdXB135VT0RirElFuvrQwdNB6+elF0/6Gxe GaM4Pzzf+o0fR+gucm7V62HM+mKLZ2lXaCghrbf51hbbO26Sl21IoV7YSHI2UF6xtd1l 4ZUwjm11hUAxArP9vmEI3+NhLQkpffTfOmR+HR9IvWwWAjOBHWBOyukMQW9wV4H2W9Rt 0arg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=lzbdLZFqoAUw5VmnK9BAd5vJo5WjnajEAQ5lxybdLko=; b=eVTrugdYwLCQP977Ek/5Gqut4gl40RhqRPsSITTz3gz3ddRQCW6nbZohStHSEKbW0l jkLHx8F6Vs5bAUPFuyA+AVOZ9khJE5hwCPx3Nrq+9kEO9qBxiBY4iD44JZYYtu75y1PN +DCeYnrsOYle6Y+nM4o2KQx/3VgxnYaCBm3SEYYnWDxgkrMvnuvE9dTTJmtLGrOOYLfu tBBFf4dzilWdpRm722cx8lKeaeIKZ+U6+iUMdFIC/THarOVpAfOeCTXa+pIVKy8v9oSs QVIociDTQZERLEcBYqbmBK/a7FGwpE0P0BhR2sh/+E6BJIEaCvlofi5C3tg37C6ny7K6 NAYA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id a17-20020a170902ecd100b001aaf7c46645si501394plh.11.2023.05.23.19.45.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 May 2023 19:45:21 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 34O2jEc7032413 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 24 May 2023 04:45:16 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH 3/4] testsuite: Separate common part of kas-based test example Date: Wed, 24 May 2023 04:45:13 +0200 Message-Id: <20230524024514.17042-4-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230524024514.17042-1-ubely@ilbers.de> References: <20230524024514.17042-1-ubely@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: 2A1kKxqFWXL7 Avocado installation and configuration are steps required by any kind of testing (qemu or hardware). Separate appropriate stuff out of run_test.sh. Signed-off-by: Uladzimir Bely --- meta-isar/test/common.sh | 30 ++++++++++++++++++++++++++++++ meta-isar/test/run_test.sh | 33 +++++---------------------------- meta-isar/test/sample_test.py | 0 3 files changed, 35 insertions(+), 28 deletions(-) create mode 100755 meta-isar/test/common.sh mode change 100644 => 100755 meta-isar/test/sample_test.py diff --git a/meta-isar/test/common.sh b/meta-isar/test/common.sh new file mode 100755 index 00000000..e0e4ee6c --- /dev/null +++ b/meta-isar/test/common.sh @@ -0,0 +1,30 @@ +#!/usr/bin/env bash + +set -e + +# Make Isar testsuite accessable +export PYTHONPATH=${PYTHONPATH}:${TESTSUITEDIR} + +# install avocado in virtualenv in case it is not there already +if ! command -v avocado > /dev/null; then + sudo apt-get -y update + sudo apt-get -y install virtualenv + rm -rf /tmp/avocado_venv + virtualenv --python python3 /tmp/avocado_venv + source /tmp/avocado_venv/bin/activate + pip install avocado-framework==100.1 +fi + +# Start tests in this dir +BASE_DIR="/build/avocado" + +# Provide working path +mkdir -p .config/avocado +cat < .config/avocado/avocado.conf +[datadir.paths] +base_dir = ${BASE_DIR}/ +data_dir = ${BASE_DIR}/data +logs_dir = ${BASE_DIR}/logs +test_dir = ${BASE_DIR}/test +EOF +export VIRTUAL_ENV="./" diff --git a/meta-isar/test/run_test.sh b/meta-isar/test/run_test.sh index c4a7d4ac..6083e635 100755 --- a/meta-isar/test/run_test.sh +++ b/meta-isar/test/run_test.sh @@ -1,17 +1,10 @@ #!/usr/bin/env bash -# Make Isar testsuite accessable -export PYTHONPATH=${PYTHONPATH}:${TESTSUITEDIR} +set -e -# install avocado in virtualenv in case it is not there already -if ! command -v avocado > /dev/null; then - sudo apt-get -y update - sudo apt-get -y install virtualenv - rm -rf /tmp/avocado_venv - virtualenv --python python3 /tmp/avocado_venv - source /tmp/avocado_venv/bin/activate - pip install avocado-framework==100.1 -fi +test_dir=$(dirname $(realpath $0)) + +. ${test_dir}/common.sh # Install qemu if ! command -v qemu-system-aarch64 > /dev/null; then @@ -19,21 +12,5 @@ if ! command -v qemu-system-aarch64 > /dev/null; then sudo apt-get -y install --no-install-recommends qemu-system-aarch64 ipxe-qemu fi -# Start tests in this dir -BASE_DIR="/build/avocado" - -# Provide working path -mkdir -p .config/avocado -cat < .config/avocado/avocado.conf -[datadir.paths] -base_dir = ${BASE_DIR}/ -data_dir = ${BASE_DIR}/data -logs_dir = ${BASE_DIR}/logs -test_dir = ${BASE_DIR}/test -EOF -export VIRTUAL_ENV="./" - -tsd=$(dirname $(realpath $0))/scripts - # Run SSH tests -avocado run --max-parallel-tasks=1 /work/sample_test.py -p test_script_dir=${tsd} +avocado run --max-parallel-tasks=1 /work/sample_test.py -p test_script_dir=${test_dir} diff --git a/meta-isar/test/sample_test.py b/meta-isar/test/sample_test.py old mode 100644 new mode 100755 -- 2.20.1