summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Guo <robertguo@me.com>2019-06-05 11:36:29 -0400
committerRobert Guo <robert.guo@10gen.com>2019-06-07 10:29:04 -0400
commitce8dec71a3bde48549b68aa2f1f20b940f3c9a05 (patch)
treeda09bc9f06e4637e2f0d5e3526a434bc8bed3cdb
parent95a175ffa964ce45d8a327fb68f6ca96d6ab7f71 (diff)
downloadmongo-ce8dec71a3bde48549b68aa2f1f20b940f3c9a05.tar.gz
SERVER-41401 Use absolute path and ignore deleted files in lint fuzzer sanity patch
(cherry picked from commit b1ff28c63836aa13112cf3499574160a5950c6ec)
-rw-r--r--etc/evergreen.yml25
1 files changed, 21 insertions, 4 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index e7bf34d763d..4e4e7728407 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -249,7 +249,7 @@ variables:
- func: "clear OOM messages"
- command: manifest.load
- func: "git get project"
- - func: "get modified patch files"
+ - func: "get all modified patch files"
- func: "set task expansion macros"
# The python virtual environment is installed in ${workdir}, which is created in
# "set up virtualenv".
@@ -990,7 +990,7 @@ functions:
mkdir -p ../../../../../../mongo-tools/distsrc
cp THIRD-PARTY-NOTICES ../../../../../../mongo-tools/distsrc/THIRD-PARTY-NOTICES.gotools
- "get modified patch files":
+ "get all modified patch files":
command: shell.exec
params:
working_dir: src
@@ -1011,6 +1011,23 @@ functions:
fi
fi
+ # This function should only be called from patch-build-only tasks.
+ "get added and modified patch files":
+ command: shell.exec
+ params:
+ working_dir: src
+ shell: bash
+ script: |
+ set -o verbose
+ set -o errexit
+
+ git diff HEAD --name-only --line-prefix="${workdir}/src/" --diff-filter=d >> modified_and_created_patch_files.txt
+ if [ -d src/mongo/db/modules/enterprise ]; then
+ pushd src/mongo/db/modules/enterprise
+ git diff HEAD --name-only --line-prefix="${workdir}/src/src/mongo/db/modules/enterprise/" --diff-filter=d >> ~1/modified_and_created_patch_files.txt
+ popd
+ fi
+
"determine resmoke jobs": &determine_resmoke_jobs
command: shell.exec
params:
@@ -1801,7 +1818,7 @@ functions:
# Run parse-jsfiles on 50 files at a time with 32 processes in parallel.
# Grep returns 1 if it fails to find a match.
- (grep "\.js$" patch_files.txt || true) | sed -e "s|^|$PWD/|" | xargs -P 32 -L 50 npm run --prefix jstestfuzz parse-jsfiles --
+ (grep "\.js$" modified_and_created_patch_files.txt || true) | xargs -P 32 -L 50 npm run --prefix jstestfuzz parse-jsfiles --
"lint fuzzer sanity all":
- command: shell.exec
@@ -5406,7 +5423,7 @@ tasks:
- command: manifest.load
- func: "git get project"
- func: "set task expansion macros"
- - func: "get modified patch files"
+ - func: "get added and modified patch files"
- func: "setup jstestfuzz"
- func: "lint fuzzer sanity patch"