Bug 1318318 - Improve clone_libfuzzer.sh and clone_corpus.sh handling of existing checkouts r=franziskus

Differential Revision: https://nss-review.dev.mozaws.net/D77

2 files changed, 15 insertions, 6 deletions

diff --git a/fuzz/clone_corpus.sh b/fuzz/clone_corpus.sh
index 71ea727e0..55707f06d 100755
--- a/fuzz/clone_corpus.sh
+++ b/fuzz/clone_corpus.sh
@@ -1,4 +1,11 @@
 #!/bin/sh
 
 cd $(dirname $0)
-git clone https://github.com/mozilla/nss-fuzzing-corpus corpus
+
+mkdir tmp/
+git clone --no-checkout --depth 1 https://github.com/mozilla/nss-fuzzing-corpus tmp/
+(cd tmp && git reset --hard master)
+
+mkdir -p corpus
+cp -r tmp/* corpus
+rm -Rf tmp/
diff --git a/fuzz/clone_libfuzzer.sh b/fuzz/clone_libfuzzer.sh
index 14af2cd95..e7298b8a7 100755
--- a/fuzz/clone_libfuzzer.sh
+++ b/fuzz/clone_libfuzzer.sh
@@ -1,9 +1,11 @@
 #!/bin/sh
 
 cd $(dirname $0)
+
 mkdir tmp/
-git clone -q https://chromium.googlesource.com/chromium/llvm-project/llvm/lib/Fuzzer tmp/
-mv tmp/.git libFuzzer/
-rm -fr tmp
-cd libFuzzer
-git reset --hard 1b543d6e5073b56be214394890c9193979a3d7e1
+git clone --no-checkout --depth 1 https://chromium.googlesource.com/chromium/llvm-project/llvm/lib/Fuzzer tmp/
+(cd tmp && git reset --hard 1b543d6e5073b56be214394890c9193979a3d7e1)
+
+mkdir -p libFuzzer
+cp tmp/*.cpp tmp/*.h tmp/*.def libFuzzer
+rm -Rf tmp/