From e86d0110125a5d6678d19aa691c1c4ea6a84d647 Mon Sep 17 00:00:00 2001 From: Jonathan Abrahams Date: Mon, 27 Aug 2018 08:36:40 -0400 Subject: [PATCH] SERVER-36757 Generate and extract mongoebench-compatible JSON config files to consistent locations --- .gitignore | 3 +++ src/third_party/scripts/mongo-perf_get_sources.sh | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f33874fbbdc..af2972754d6 100644 --- a/.gitignore +++ b/.gitignore @@ -112,6 +112,9 @@ scratch /clientTest /httpClientTest +# benchrun files +/benchrun_embedded + # Linters .mypy_cache diff --git a/src/third_party/scripts/mongo-perf_get_sources.sh b/src/third_party/scripts/mongo-perf_get_sources.sh index a0b79b20d15..80f9d1bc07b 100755 --- a/src/third_party/scripts/mongo-perf_get_sources.sh +++ b/src/third_party/scripts/mongo-perf_get_sources.sh @@ -26,7 +26,7 @@ fi NAME=mongo-perf SRC_ROOT=$(mktemp -d /tmp/$NAME.XXXXXX) trap "rm -rf $SRC_ROOT" EXIT -DEST_DIR=$(git rev-parse --show-toplevel)/src/third_party/$NAME +DEST_DIR=$(git rev-parse --show-toplevel)/benchrun_embedded/testcases git clone --branch=master https://github.com/mongodb/mongo-perf.git $SRC_ROOT @@ -55,6 +55,6 @@ find testcases -type f -print0 | xargs -0 -I% -n1 -P$NUM_CPUS \ popd test -d $DEST_DIR && rm -r $DEST_DIR -mkdir -p $DEST_DIR +mkdir -p $(dirname $DEST_DIR) -mv $SRC_ROOT/mongoebench/ $DEST_DIR/ +mv $SRC_ROOT/mongoebench $DEST_DIR