Skip to content

Commit 1de42e8

Browse files
authored
GODRIVER-1933 remove xtrace from shell scripts (#661)
1 parent e0f4b3c commit 1de42e8

File tree

3 files changed

+7
-16
lines changed

3 files changed

+7
-16
lines changed

.evergreen/config.yml

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ functions:
9494
PROJECT_DIRECTORY: "$PROJECT_DIRECTORY"
9595
PREPARE_SHELL: |
9696
set -o errexit
97-
set -o xtrace
9897
export GOPATH="$GOPATH"
9998
export GOROOT="${GO_DIST}"
10099
export GOCACHE="$GOCACHE"
@@ -317,7 +316,6 @@ functions:
317316
fi
318317
319318
export GOFLAGS=-mod=vendor
320-
set +o xtrace
321319
AUTH=${AUTH} \
322320
SSL=${SSL} \
323321
MONGODB_URI="${MONGODB_URI}" \
@@ -352,7 +350,7 @@ functions:
352350
silent: true
353351
working_dir: src/go.mongodb.org/mongo-driver
354352
script: |
355-
# DO NOT ECHO WITH XTRACE (which PREPARE_SHELL does)
353+
# DO NOT ECHO WITH XTRACE
356354
if [ "Windows_NT" = "$OS" ]; then
357355
export GOPATH=$(cygpath -w $(dirname $(dirname $(dirname `pwd`))))
358356
export GOCACHE=$(cygpath -w "$(pwd)/.cache")
@@ -372,7 +370,7 @@ functions:
372370
params:
373371
working_dir: src/go.mongodb.org/mongo-driver
374372
script: |
375-
# DO NOT ECHO WITH XTRACE (which PREPARE_SHELL does)
373+
# DO NOT ECHO WITH XTRACE
376374
if [ "Windows_NT" = "$OS" ]; then
377375
export GOPATH=$(cygpath -w $(dirname $(dirname $(dirname `pwd`))))
378376
export GOCACHE=$(cygpath -w "$(pwd)/.cache")
@@ -399,7 +397,7 @@ functions:
399397
params:
400398
working_dir: src/go.mongodb.org/mongo-driver
401399
script: |
402-
# DO NOT ECHO WITH XTRACE (which PREPARE_SHELL does)
400+
# DO NOT ECHO WITH XTRACE
403401
if [ "Windows_NT" = "$OS" ]; then
404402
export GOPATH=$(cygpath -w $(dirname $(dirname $(dirname `pwd`))))
405403
export GOCACHE=$(cygpath -w "$(pwd)/.cache")
@@ -426,7 +424,7 @@ functions:
426424
params:
427425
working_dir: src/go.mongodb.org/mongo-driver
428426
script: |
429-
# DO NOT ECHO WITH XTRACE (which PREPARE_SHELL does)
427+
# DO NOT ECHO WITH XTRACE
430428
if [ "Windows_NT" = "$OS" ]; then
431429
export GOPATH=$(cygpath -w $(dirname $(dirname $(dirname `pwd`))))
432430
export GOCACHE=$(cygpath -w "$(pwd)/.cache")
@@ -462,7 +460,6 @@ functions:
462460
export MONGO_GO_DRIVER_CA_FILE=$(cygpath -m $MONGO_GO_DRIVER_CA_FILE)
463461
fi
464462
465-
set +o xtrace
466463
AUTH="auth" \
467464
SSL="ssl" \
468465
TOPOLOGY="server" \
@@ -495,7 +492,6 @@ functions:
495492
. ${DRIVERS_TOOLS}/.evergreen/csfle/set-temp-creds.sh
496493
497494
export GOFLAGS=-mod=vendor
498-
set +o xtrace
499495
AUTH="${AUTH}" \
500496
SSL="${SSL}" \
501497
MONGODB_URI="${MONGODB_URI}" \
@@ -548,7 +544,6 @@ functions:
548544
# testing Client instances, so we set MONGODB_URI to SINGLE_MONGOS_LB_URI.
549545
550546
export GOFLAGS=-mod=vendor
551-
set +o xtrace
552547
AUTH="${AUTH}" \
553548
SSL="${SSL}" \
554549
MONGODB_URI="${SINGLE_MONGOS_LB_URI}" \
@@ -565,7 +560,6 @@ functions:
565560
working_dir: src/go.mongodb.org/mongo-driver
566561
script: |
567562
${PREPARE_SHELL}
568-
set +o xtrace
569563
AUTH="auth" \
570564
SSL="nossl" \
571565
TOPOLOGY="server" \
@@ -739,7 +733,7 @@ functions:
739733
working_dir: "src"
740734
silent: true
741735
script: |
742-
# DO NOT ECHO WITH XTRACE (which PREPARE_SHELL does)
736+
# DO NOT ECHO WITH XTRACE
743737
cat <<'EOF' > "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh"
744738
alias urlencode='python -c "import sys, urllib as ul; sys.stdout.write(ul.quote_plus(sys.argv[1]))"'
745739
alias jsonkey='python -c "import json,sys;sys.stdout.write(json.load(sys.stdin)[sys.argv[1]])" < ${DRIVERS_TOOLS}/.evergreen/auth_aws/creds.json'
@@ -791,7 +785,7 @@ functions:
791785
working_dir: "src"
792786
silent: true
793787
script: |
794-
# DO NOT ECHO WITH XTRACE (which PREPARE_SHELL does)
788+
# DO NOT ECHO WITH XTRACE
795789
cat <<'EOF' > "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh"
796790
export AWS_ACCESS_KEY_ID=${iam_auth_ecs_account}
797791
export AWS_SECRET_ACCESS_KEY=${iam_auth_ecs_secret_access_key}
@@ -811,7 +805,7 @@ functions:
811805
working_dir: "src"
812806
silent: true
813807
script: |
814-
# DO NOT ECHO WITH XTRACE (which PREPARE_SHELL does)
808+
# DO NOT ECHO WITH XTRACE
815809
cat <<'EOF' > "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh"
816810
alias jsonkey='python -c "import json,sys;sys.stdout.write(json.load(sys.stdin)[sys.argv[1]])" < ${DRIVERS_TOOLS}/.evergreen/auth_aws/creds.json'
817811
export AWS_ACCESS_KEY_ID=$(jsonkey AccessKeyId)
@@ -890,7 +884,6 @@ functions:
890884
export KMS_TLS_TESTCASE="${KMS_TLS_TESTCASE}"
891885
892886
export GOFLAGS=-mod=vendor
893-
set +o xtrace
894887
AUTH="${AUTH}" \
895888
SSL="${SSL}" \
896889
MONGODB_URI="${MONGODB_URI}" \

.evergreen/run-mongodb-aws-ecs-test.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#!/bin/bash
22

3-
set -o xtrace
43
set -o errexit # Exit the script with error if any of the commands fail
54

65
############################################

.evergreen/run-mongodb-aws-test.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#!/bin/bash
22

3-
set -o xtrace
43
set -o errexit # Exit the script with error if any of the commands fail
54

65
############################################

0 commit comments

Comments
 (0)