Use tests from build
Previously the tests were cloned from the upstream repo, where they also contain tests for SHA-1. After restricting SHA-1, these tests cannot succeed. Use updated tests from patches instead. Resolves: rhbz#2060768 Signed-off-by: Štěpán Horáček <shoracek@redhat.com>
This commit is contained in:
parent
e5eb743f56
commit
d56bd7eab9
@ -39,12 +39,8 @@ sleep 10
|
|||||||
|
|
||||||
export TPM_INTERFACE_TYPE=socsim
|
export TPM_INTERFACE_TYPE=socsim
|
||||||
|
|
||||||
# get tss2 tests
|
# use the tss2 tests from the sources
|
||||||
TSS2_VERSION=v1.6.0
|
pushd ./source/utils
|
||||||
git clone https://git.code.sf.net/p/ibmtpm20tss/tss
|
|
||||||
pushd tss
|
|
||||||
git checkout -b test $TSS2_VERSION
|
|
||||||
pushd utils
|
|
||||||
# fix python calls to use rhel name for python3
|
# fix python calls to use rhel name for python3
|
||||||
sed -i -e 's/^PREFIX=\.\//PREFIX=tss/g' reg.sh
|
sed -i -e 's/^PREFIX=\.\//PREFIX=tss/g' reg.sh
|
||||||
# fix paths in rootcerts.txt
|
# fix paths in rootcerts.txt
|
||||||
@ -54,10 +50,9 @@ sed -i -e "s|/gsa/yktgsa/home/k/g/kgold/tpm2/utils|${c}|g" certificates/rootcert
|
|||||||
./reg.sh -a
|
./reg.sh -a
|
||||||
res="$?"
|
res="$?"
|
||||||
popd
|
popd
|
||||||
popd
|
|
||||||
|
|
||||||
# clean up
|
# clean up
|
||||||
pkill tpm_server
|
pkill tpm_server
|
||||||
rm -rf ibmtpm ibmtpm$IBMTPM_VERSION.tar.gz tss
|
rm -rf ibmtpm tss
|
||||||
|
|
||||||
exit $res
|
exit $res
|
||||||
|
@ -1,5 +1,8 @@
|
|||||||
- hosts: localhost
|
- hosts: localhost
|
||||||
roles:
|
roles:
|
||||||
|
- role: standard-test-source
|
||||||
|
tags:
|
||||||
|
- always
|
||||||
- role: standard-test-basic
|
- role: standard-test-basic
|
||||||
tags:
|
tags:
|
||||||
- classic
|
- classic
|
||||||
|
@ -28,6 +28,7 @@ BuildRequires: autoconf
|
|||||||
BuildRequires: libtool
|
BuildRequires: libtool
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: openssl-devel
|
BuildRequires: openssl-devel
|
||||||
|
BuildRequires: git
|
||||||
Requires: openssl
|
Requires: openssl
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -48,7 +49,7 @@ Development libraries and headers for IBM's TSS 2.0. You will need this in
|
|||||||
order to build TSS 2.0 applications.
|
order to build TSS 2.0 applications.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1 -c %{name}-%{version}
|
%autosetup -S git -p1 -c %{name}-%{version}
|
||||||
|
|
||||||
%build
|
%build
|
||||||
autoreconf -vi
|
autoreconf -vi
|
||||||
|
Loading…
Reference in New Issue
Block a user