From 3f733ed39f7a7e019609f0bf041676846cb2a00f Mon Sep 17 00:00:00 2001 From: Vilem Marsik Date: Wed, 9 Apr 2025 21:38:51 +0200 Subject: [PATCH] TMT migration for c10s Have adapted the same changes as for c9s: - migrated to TMT (tests.yml to test.fmf) - fixed hardcoded automake version --- tests/runtest.sh | 3 ++- tests/tests.fmf | 12 ++++++++++++ tests/tests.yml | 29 ----------------------------- 3 files changed, 14 insertions(+), 30 deletions(-) create mode 100644 tests/tests.fmf delete mode 100644 tests/tests.yml diff --git a/tests/runtest.sh b/tests/runtest.sh index b066f5b..e499c05 100755 --- a/tests/runtest.sh +++ b/tests/runtest.sh @@ -19,6 +19,7 @@ TPM2_ABRMD=tpm2-abrmd TPM2_SIM=swtpm TPM2_TOOLS_TEST_FIXTURES=`pwd`/tpm2-tools/test/integration/fixtures PATH=`pwd`/ibmtpm/src/:.:$PATH +AUTOMAKE_VERSION=`rpm -q automake --qf '%{VERSION}' | cut -d. -f-2` abs_srcdir=`pwd`/tpm2-tools srcdir=$abs_srcdir export TPM2_ABRMD TPM2_SIM TPM2_TOOLS_TEST_FIXTURES PATH abs_srcdir srcdir @@ -28,7 +29,7 @@ for t in `ls tests/*.sh` do f=`basename $t` test=${f%%.*} - /usr/share/automake-1.16/test-driver --test-name $test --log-file $test.log --trs-file $test.trs $t + /usr/share/automake-${AUTOMAKE_VERSION}/test-driver --test-name $test --log-file $test.log --trs-file $test.trs $t done all=`grep ":test-result:" *.trs | wc -l`; pass=`grep ":test-result: PASS" *.trs | wc -l`; diff --git a/tests/tests.fmf b/tests/tests.fmf new file mode 100644 index 0000000..1a4db94 --- /dev/null +++ b/tests/tests.fmf @@ -0,0 +1,12 @@ +summary: running tpm2-tss tests/ from https://github.com/01org/tpm2-tools.git +contact: Štěpán Horáček +component: tpm2-tss +require: + - wget + - git + - automake + - tpm2-abrmd + - tpm2-tools +test: sh ./runtest.sh +framework: shell +duration: 60m diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index b122cef..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,29 +0,0 @@ -- hosts: localhost - roles: - - role: standard-test-basic - tags: - - classic - required_packages: - - gcc - - make - - automake - - wget - - openssl - - openssl-devel - - sed - - tpm2-tss - - tpm2-tss-devel - - tpm2-tools - - tpm2-abrmd - - tpm2-abrmd-selinux - - python3 - - git - - vim-common - - perl-Digest-SHA - - dbus-daemon - - swtpm - tests: - - intel-tpm2: - dir: . - run: dbus-run-session ./runtest.sh - timeout: 60m