AWSLC/BLST: Uniformly copy executables from SAW's CI

GaloisInc · Dec 7, 2022 · bebb25b · bebb25b
1 parent 62936cb
commit bebb25b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/s2nTests/scripts/awslc-entrypoint.sh b/s2nTests/scripts/awslc-entrypoint.sh
@@ -6,6 +6,7 @@ cd /saw-script/aws-lc-verification/SAW
 rm bin/saw
 cp /saw-bin/saw bin/saw
 cp /saw-bin/abc bin/abc
+cp /saw-bin/yices bin/yices
 # Z3 4.8.14 has been known to nondeterministically time out with the AWSLC
 # proofs, so fall back to 4.8.10 instead. See #1772.
 cp /saw-bin/z3-4.8.10 bin/z3

diff --git a/s2nTests/scripts/blst-entrypoint.sh b/s2nTests/scripts/blst-entrypoint.sh
@@ -3,14 +3,13 @@ set -xe
 
 cd /workdir
 ./scripts/install.sh
+cp /saw-bin/cryptol bin/cryptol
 cp /saw-bin/saw bin/saw
-
-wget --quiet -O solvers.zip "https://github.com/GaloisInc/what4-solvers/releases/download/snapshot-20221205/ubuntu-22.04-bin.zip"
-(cd bin && unzip -o ../solvers.zip)
-chmod +x bin/*
+cp /saw-bin/abc bin/abc
+cp /saw-bin/yices bin/yices
 # Z3 4.8.14 has been known to nondeterministically time out with the BLST
 # proofs, so fall back to 4.8.10 instead. See #1772.
-cp bin/z3-4.8.10 bin/z3
+cp /saw-bin/z3-4.8.10 bin/z3
 
 export PATH=/workdir/bin:$PATH
 export CRYPTOLPATH=/workdir/cryptol-specs:/workdir/spec