2 files changed, 5 insertions, 20 deletions
diff --git a/llvm/lib/Fuzzer/fuzzer-test-suite/openssl-1.0.2d/build.sh b/llvm/lib/Fuzzer/fuzzer-test-suite/openssl-1.0.2d/build.sh
index e60818be3cc..a22ea4e0a28 100755
--- a/llvm/lib/Fuzzer/fuzzer-test-suite/openssl-1.0.2d/build.sh
+++ b/llvm/lib/Fuzzer/fuzzer-test-suite/openssl-1.0.2d/build.sh
@@ -1,25 +1,13 @@
 #!/bin/bash
+. $(dirname $0)/../common.sh
 
-[ -e $(basename $0) ] && echo "PLEASE USE THIS SCRIPT FROM ANOTHER DIR" && exit 1
-SCRIPT_DIR=$(dirname $0)
-EXECUTABLE_NAME_BASE=$(basename $SCRIPT_DIR)
-LIBFUZZER_SRC=$(dirname $(dirname $SCRIPT_DIR))
-JOBS=20
-
-# FUZZ_CXXFLAGS=" -g -fsanitize=address -fsanitize-coverage=edge"
-FUZZ_CXXFLAGS=" -g -fsanitize=address -fsanitize-coverage=trace-pc-guard,trace-cmp,trace-div,trace-gep"
-
-get() {
-  [ ! -e SRC ] && git clone https://github.com/openssl/openssl.git SRC && (cd SRC && git checkout OpenSSL_1_0_2d)
-#  [ ! -e SRC ] && wget https://www.openssl.org/source/openssl-1.0.1f.tar.gz && tar xf openssl-1.0.1f.tar.gz && mv openssl-1.0.1f SRC
-}
 build_lib() {
   rm -rf BUILD
   cp -rf SRC BUILD
   (cd BUILD && ./config && make clean && make CC="clang $FUZZ_CXXFLAGS"  -j $JOBS)
 }
 
-get
+get_git_tag https://github.com/openssl/openssl.git OpenSSL_1_0_2d SRC
 build_lib
-$LIBFUZZER_SRC/build.sh
-echo clang++ -g $SCRIPT_DIR/target.cc -DCERT_PATH=\"$SCRIPT_DIR/\"  $FUZZ_CXXFLAGS BUILD/libssl.a BUILD/libcrypto.a libFuzzer.a -lgcrypt -o $EXECUTABLE_NAME_BASE
+build_libfuzzer
+clang++ -g $SCRIPT_DIR/target.cc -DCERT_PATH=\"$SCRIPT_DIR/\"  $FUZZ_CXXFLAGS BUILD/libssl.a BUILD/libcrypto.a libFuzzer.a -lgcrypt -o $EXECUTABLE_NAME_BASE
diff --git a/llvm/lib/Fuzzer/fuzzer-test-suite/openssl-1.0.2d/test.sh b/llvm/lib/Fuzzer/fuzzer-test-suite/openssl-1.0.2d/test.sh
index e528b043481..0473c3d246f 100755
--- a/llvm/lib/Fuzzer/fuzzer-test-suite/openssl-1.0.2d/test.sh
+++ b/llvm/lib/Fuzzer/fuzzer-test-suite/openssl-1.0.2d/test.sh
@@ -1,9 +1,6 @@
 #!/bin/bash
 set -x
-SCRIPT_DIR=$(dirname $0)
-EXECUTABLE_NAME_BASE=$(basename $SCRIPT_DIR)
-CORPUS=CORPUS-$EXECUTABLE_NAME_BASE
-JOBS=8
+. $(dirname $0)/../common.sh
 rm -rf $CORPUS
 mkdir $CORPUS
 [ -e $EXECUTABLE_NAME_BASE ] && ./$EXECUTABLE_NAME_BASE -artifact_prefix=$CORPUS/ -max_len=512  -jobs=$JOBS -workers=$JOBS $CORPUS