From eb30c4ea0f31d5ded0a7a0000e19d77aa614ebe6 Mon Sep 17 00:00:00 2001
From: Josh Russett <jrussett@pivotal.io>
Date: Thu, 29 Mar 2018 10:53:13 -0700
Subject: [PATCH] Actually fix globbing

[Finishes #156210676](https://www.pivotaltracker.com/story/show/156210676)

Signed-off-by: Luan Santos <lsantos@pivotal.io>
---
 jobs/acceptance-tests/templates/run.erb |  4 ++--
 packages/acceptance-tests/spec          |  2 +-
 scripts/test-acceptance-windows         | 11 +++++------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/jobs/acceptance-tests/templates/run.erb b/jobs/acceptance-tests/templates/run.erb
index 9b830b25f..2515013a4 100644
--- a/jobs/acceptance-tests/templates/run.erb
+++ b/jobs/acceptance-tests/templates/run.erb
@@ -20,8 +20,8 @@ ${BOSH_BINARY_PATH} cloud-config > ${TEST_CLOUD_CONFIG_PATH}
 
 source /var/vcap/packages/golang-1.8-linux/bosh/runtime.env
 
-mkdir -p $GOPATH/src
-cp -R /var/vcap/packages/acceptance-tests/src/bosh-dns $GOPATH/src/bosh-dns
+mkdir -p $GOPATH/src/bosh-dns
+cp -R /var/vcap/packages/acceptance-tests/src/bosh-dns/. $GOPATH/src/bosh-dns/
 
 go install bosh-dns/vendor/github.com/onsi/ginkgo/ginkgo
 
diff --git a/packages/acceptance-tests/spec b/packages/acceptance-tests/spec
index 228ca336e..2002f62e7 100644
--- a/packages/acceptance-tests/spec
+++ b/packages/acceptance-tests/spec
@@ -6,7 +6,7 @@ dependencies: []
 files:
 - bosh-dns/acceptance_tests/**/*
 - bosh-dns/healthcheck/healthclient/*
-- bosh-dns/test_yml_assets/*
+- bosh-dns/test_yml_assets/**/*
 - bosh-dns/vendor/**/*
 - bosh-cli/bosh-cli-2.0.16-linux-amd64
 
diff --git a/scripts/test-acceptance-windows b/scripts/test-acceptance-windows
index dccb96eb4..46b830abb 100755
--- a/scripts/test-acceptance-windows
+++ b/scripts/test-acceptance-windows
@@ -2,9 +2,10 @@
 
 set -e -o pipefail
 set -x
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 clean_up() {
-  fly -t production execute -x --privileged \
+  fly -t production execute --privileged \
     --config=$DIR/../ci/tasks/clean-up.yml \
     --inputs-from=bosh-dns-release/test-acceptance-windows
 }
@@ -12,7 +13,6 @@ clean_up() {
 trap "clean_up" EXIT
 
 main() {
-  DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
   tarball_dir=$(mktemp -d)
   bosh create-release --force --tarball=${tarball_dir}/bosh-windows-dns-release.tgz
   pushd $tarball_dir
@@ -21,7 +21,7 @@ main() {
 
   echo "### starting windows-specific tests..."
   # windows specfic
-  fly -t production execute -x --privileged \
+  fly -t production execute --privileged \
     --config=$DIR/../ci/tasks/test-acceptance-windows.yml \
     --inputs-from=bosh-dns-release/test-acceptance-windows \
     --input=bosh-dns-release=$DIR/../ \
@@ -29,19 +29,18 @@ main() {
 
   # nameserver-disabled
   echo "### tests: nameserver-disabled"
-  fly -t production execute -x --privileged \
+  fly -t production execute --privileged \
     --config=$DIR/../ci/tasks/test-acceptance-windows-nameserver-disabled.yml \
     --inputs-from=bosh-dns-release/test-acceptance-windows \
     --input=bosh-dns-release=$DIR/../
 
   # shared
   echo "### tests: shared"
-  fly -t production execute -x --privileged \
+  fly -t production execute --privileged \
     --config=$DIR/../ci/tasks/test-acceptance-windows-shared.yml \
     --inputs-from=bosh-dns-release/test-acceptance-windows \
     --input=bosh-dns-release=$DIR/../ \
     --input=candidate-release=${tarball_dir}
-
 }
 
 main $@