summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-09-25 09:40:24 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2019-09-25 09:40:24 -0700
commit301310c6d24e5b135d1efd3d4a9cc6adc4fbd94a (patch)
tree819a1ccf187a6b873e6cc2c40a4bde96687b5cc6 /tools
parent4ef5b13a294c136c9673a8e04e6afea333c7f755 (diff)
parente13cd21ffd50a07b55dcc4d8c38cedf27f28eaa1 (diff)
downloadlinux-301310c6d24e5b135d1efd3d4a9cc6adc4fbd94a.tar.bz2
Merge tag 'tpmdd-next-20190925' of git://git.infradead.org/users/jjs/linux-tpmdd
Pull tpm fixes from Jarkko Sakkinen. * tag 'tpmdd-next-20190925' of git://git.infradead.org/users/jjs/linux-tpmdd: tpm: Wrap the buffer from the caller to tpm_buf in tpm_send() MAINTAINERS: keys: Update path to trusted.h KEYS: trusted: correctly initialize digests and fix locking issue selftests/tpm2: Add log and *.pyc to .gitignore selftests/tpm2: Add the missing TEST_FILES assignment
Diffstat (limited to 'tools')
-rw-r--r--tools/testing/selftests/.gitignore2
-rw-r--r--tools/testing/selftests/tpm2/Makefile1
2 files changed, 3 insertions, 0 deletions
diff --git a/tools/testing/selftests/.gitignore b/tools/testing/selftests/.gitignore
index 8059ce834247..61df01cdf0b2 100644
--- a/tools/testing/selftests/.gitignore
+++ b/tools/testing/selftests/.gitignore
@@ -2,3 +2,5 @@ gpiogpio-event-mon
gpiogpio-hammer
gpioinclude/
gpiolsgpio
+tpm2/SpaceTest.log
+tpm2/*.pyc
diff --git a/tools/testing/selftests/tpm2/Makefile b/tools/testing/selftests/tpm2/Makefile
index 9dd848427a7b..bf401f725eef 100644
--- a/tools/testing/selftests/tpm2/Makefile
+++ b/tools/testing/selftests/tpm2/Makefile
@@ -2,3 +2,4 @@
include ../lib.mk
TEST_PROGS := test_smoke.sh test_space.sh
+TEST_FILES := tpm2.py tpm2_tests.py