From 6f1a30d938e0a6688d622409fd9c42141697afd3 Mon Sep 17 00:00:00 2001
From: Samuel Breese <samuel@chame.co>
Date: Sat, 9 Jan 2021 21:12:40 -0500
Subject: [PATCH] Update blst-verification test in CI

---
 s2nTests/docker/blst.dockerfile     | 10 +++++-----
 s2nTests/scripts/blst-entrypoint.sh | 25 ++++---------------------
 2 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/s2nTests/docker/blst.dockerfile b/s2nTests/docker/blst.dockerfile
index bb0d751357..144098d8c1 100644
--- a/s2nTests/docker/blst.dockerfile
+++ b/s2nTests/docker/blst.dockerfile
@@ -4,15 +4,15 @@ RUN apt-get update
 RUN apt-get install -y wget unzip git cmake clang llvm golang python3-pip libncurses5 quilt
 RUN pip3 install wllvm
 
-WORKDIR /saw-script
-RUN mkdir -p /saw-script && \
-    git clone https://github.com/GaloisInc/blst-verification.git && \
-    cd blst-verification && \
-    git checkout cb8a2c3c57902a957d4a7ac7872fc78e51118262 && \
+RUN git clone https://github.com/GaloisInc/blst-verification.git /workdir && \
+    cd /workdir && \
+    git checkout b937dcfaf9290a7caa016fd9c906195fcc2f4791 && \
     git config --file=.gitmodules submodule.blst.url https://github.com/supranational/blst && \
     git submodule sync && \
     git submodule update --init
 
+WORKDIR /workdir
+
 COPY scripts/blst-entrypoint.sh /entrypoint.sh
 ENTRYPOINT [ "/entrypoint.sh" ]
 CMD [ "/bin/bash" ]
\ No newline at end of file
diff --git a/s2nTests/scripts/blst-entrypoint.sh b/s2nTests/scripts/blst-entrypoint.sh
index c1cf8f9dd2..05a12ccd36 100755
--- a/s2nTests/scripts/blst-entrypoint.sh
+++ b/s2nTests/scripts/blst-entrypoint.sh
@@ -1,32 +1,15 @@
 #!/usr/bin/env bash
 set -xe
 
-cd /saw-script/blst-verification
+cd /workdir
 ./scripts/install.sh
 cp /saw-bin/saw bin/saw
 
-export PATH=/saw-script/blst-verification/bin:$PATH
-export CRYPTOLPATH=/saw-script/blst-verification/cryptol-specs:/saw-script/blst-verification/spec
+export PATH=/workdir/bin:$PATH
+export CRYPTOLPATH=/workdir/cryptol-specs:/workdir/spec
 
 ./scripts/build_x86.sh
-
-# TODO: replace this section with ./scripts/build_llvm.sh once the absolute
-# path in that script is removed.
-(
-    mkdir -p build/llvm
-    rm -r build/llvm
-    cp -r blst build/llvm
-    cd /saw-script/blst-verification/build/llvm
-    for p in /saw-script/blst-verification/patches/*
-    do
-        patch -p1 -t < "$p"
-    done
-    export CFLAGS='-g -fPIC -Wall -Wextra -Werror'
-    export CC=wllvm
-    export LLVM_COMPILER=clang
-    ./build.sh
-    extract-bc --bitcode libblst.a
-)
+./scripts/build_llvm.sh
 
 ./scripts/prove.sh
 ./scripts/check.sh | if grep False; then exit 1; fi