From 1d87e37e694c24d2f710b6b6fb89313f3b7416f8 Mon Sep 17 00:00:00 2001 From: James Munnelly Date: Thu, 26 Sep 2019 17:51:08 +0100 Subject: [PATCH] Fix verify-codegen with external/ dir Signed-off-by: James Munnelly --- hack/verify-codegen.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hack/verify-codegen.sh b/hack/verify-codegen.sh index 0d81dfea2..4a6834257 100755 --- a/hack/verify-codegen.sh +++ b/hack/verify-codegen.sh @@ -36,6 +36,8 @@ tmpfiles=$TEST_TMPDIR/files mkdir -p "$tmpfiles" rm -f bazel-* cp -aL "." "$tmpfiles" + # clean up 'external' directory copied from test runfiles + rm -rf "$tmpfiles"/external export BUILD_WORKSPACE_DIRECTORY=$tmpfiles export HOME=$(realpath "$TEST_TMPDIR/home") unset GOPATH @@ -52,10 +54,7 @@ tmpfiles=$TEST_TMPDIR/files ) # Avoid diff -N so we handle empty files correctly diff=$(diff -upr \ - -x ".git" \ - -x "bazel-*" \ - -x "_output" \ - "." "$tmpfiles" 2>/dev/null || true) + "./pkg" "$tmpfiles/pkg" 2>/dev/null || true) if [[ -n "${diff}" ]]; then echo "${diff}" >&2