tjh.dev
1diff --git a/tests/libtest.sh b/tests/libtest.sh
2index 2c2a33f0..4e9d3fa2 100755
3--- a/tests/libtest.sh
4+++ b/tests/libtest.sh
5@@ -761,12 +761,12 @@ gen_ed25519_keys ()
6 {
7 # Generate private key in PEM format
8 pemfile="$(mktemp -p ${test_tmpdir} ed25519_XXXXXX.pem)"
9- openssl genpkey -algorithm ed25519 -outform PEM -out "${pemfile}"
10+ @openssl@ genpkey -algorithm ed25519 -outform PEM -out "${pemfile}"
11
12 # Based on: http://openssl.6102.n7.nabble.com/ed25519-key-generation-td73907.html
13 # Extract the private and public parts from generated key.
14- ED25519PUBLIC="$(openssl pkey -outform DER -pubout -in ${pemfile} | tail -c 32 | base64)"
15- ED25519SEED="$(openssl pkey -outform DER -in ${pemfile} | tail -c 32 | base64)"
16+ ED25519PUBLIC="$(@openssl@ pkey -outform DER -pubout -in ${pemfile} | tail -c 32 | base64)"
17+ ED25519SEED="$(@openssl@ pkey -outform DER -in ${pemfile} | tail -c 32 | base64)"
18 # Secret key is concantination of SEED and PUBLIC
19 ED25519SECRET="$(echo ${ED25519SEED}${ED25519PUBLIC} | base64 -d | base64 -w 0)"
20
21@@ -777,7 +777,7 @@ gen_ed25519_keys ()
22
23 gen_ed25519_random_public()
24 {
25- openssl genpkey -algorithm ED25519 | openssl pkey -outform DER | tail -c 32 | base64
26+ @openssl@ genpkey -algorithm ED25519 | @openssl@ pkey -outform DER | tail -c 32 | base64
27 }
28
29 is_bare_user_only_repo () {
30diff --git a/tests/test-basic-user-only.sh b/tests/test-basic-user-only.sh
31index f6e8606d..1fed2465 100755
32--- a/tests/test-basic-user-only.sh
33+++ b/tests/test-basic-user-only.sh
34@@ -27,7 +27,7 @@ extra_basic_tests=7
35 . $(dirname $0)/basic-test.sh
36
37 $CMD_PREFIX ostree --version > version.yaml
38-python3 -c 'import yaml; yaml.safe_load(open("version.yaml"))'
39+@python3@ -c 'import yaml; yaml.safe_load(open("version.yaml"))'
40 echo "ok yaml version"
41
42 # Reset things so we don't inherit a lot of state from earlier tests
43diff --git a/tests/test-remote-headers.sh b/tests/test-remote-headers.sh
44index d3bf4f97..0d2331ba 100755
45--- a/tests/test-remote-headers.sh
46+++ b/tests/test-remote-headers.sh
47@@ -24,7 +24,7 @@ echo '1..2'
48 . $(dirname $0)/libtest.sh
49
50 V=$($CMD_PREFIX ostree --version | \
51- python3 -c 'import sys, yaml; print(yaml.safe_load(sys.stdin)["libostree"]["Version"])')
52+ @python3@ -c 'import sys, yaml; print(yaml.safe_load(sys.stdin)["libostree"]["Version"])')
53
54 setup_fake_remote_repo1 "archive" "" \
55 --expected-header foo=bar \