Skip to content

Commit b62a3fb

Browse files
authored
CDRIVER-3937 Remove usages of xtrace in build scripts (#788)
* Fix wrong directory for package builds * CDRIVER-3937 Remove usages of xtrace in build scripts
1 parent 4ff8faf commit b62a3fb

32 files changed

+21
-437
lines changed

.evergreen/abi-compliance-check.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/bin/bash
2-
set -o xtrace # Write all commands first to stderr
32
set -o errexit
43

54
# create all needed directories

.evergreen/build-and-test-with-toolchain.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/bin/sh
2-
set -o xtrace # Write all commands first to stderr
32
set -o errexit # Exit the script with error if any of the commands fail
43

54
echo "BUILDING WITH TOOLCHAIN"

.evergreen/build_snapshot_rpm.sh

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

3-
set -o xtrace
43
set -o errexit
54

65
#
@@ -80,7 +79,6 @@ mock_root=$(sudo mock -r ${config} --use-bootstrap-image --isolation=simple --pr
8079
sudo mock -r ${config} --use-bootstrap-image --isolation=simple --install rpmdevtools git rpm-build cmake python python3-sphinx gcc openssl-devel
8180
sudo mock -r ${config} --use-bootstrap-image --isolation=simple --copyin "$(pwd)" "$(pwd)/${spec_file}" /tmp
8281
sudo mock -r ${config} --use-bootstrap-image --isolation=simple --cwd "/tmp/${build_dir}" --chroot -- /bin/sh -c "(
83-
set -o xtrace ;
8482
python build/calc_release_version.py | sed -E 's/([^-]+).*/\1/' > VERSION_CURRENT ;
8583
python build/calc_release_version.py -p > VERSION_RELEASED
8684
)"
@@ -104,7 +102,6 @@ fi
104102
sudo mock -r ${config} --use-bootstrap-image --isolation=simple --copyout "/tmp/${build_dir}/${spec_file}" ..
105103

106104
sudo mock -r ${config} --use-bootstrap-image --isolation=simple --cwd "/tmp/${build_dir}" --chroot -- /bin/sh -c "(
107-
set -o xtrace ;
108105
[ -d cmake-build ] || mkdir cmake-build ;
109106
cd cmake-build ;
110107
/usr/bin/cmake -DENABLE_MAN_PAGES=ON -DENABLE_HTML_DOCS=ON -DENABLE_ZLIB=BUNDLED -DENABLE_BSON=ON .. ;
@@ -125,7 +122,6 @@ sudo mock --resultdir="${mock_result}" --use-bootstrap-image --isolation=simple
125122
sudo mock -r ${config} --use-bootstrap-image --isolation=simple --copyin "${mock_result}" /tmp
126123

127124
sudo mock -r ${config} --use-bootstrap-image --isolation=simple --cwd "/tmp/${build_dir}" --chroot -- /bin/sh -c "(
128-
set -o xtrace &&
129125
rpm -Uvh ../mock-result/*.rpm &&
130126
gcc -I/usr/include/libmongoc-1.0 -I/usr/include/libbson-1.0 -o example-client src/libmongoc/examples/example-client.c -lmongoc-1.0 -lbson-1.0
131127
)"

.evergreen/check-public-decls.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/bin/sh
2-
set -o xtrace # print commands to stderr.
32

43
# regex to match public headers.
54
pattern="\.\/src\/libmongoc\/src\/mongoc\/mongoc.*[^private]\.h$"

.evergreen/check-release-archive.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/bin/sh
2-
set -o xtrace # Write all commands first to stderr
32
set -o errexit # Exit the script with error if any of the commands fail
43

54
# Check that a CLion user didn't accidentally convert NEWS from UTF-8 to ASCII

.evergreen/compile-unix.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/bin/sh
2-
set -o xtrace # Write all commands first to stderr
32
set -o errexit # Exit the script with error if any of the commands fail
43

54
# Supported/used environment variables:

.evergreen/compile-windows.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#!/bin/sh
22
set -o igncr # Ignore CR in this script
3-
set -o xtrace # Write all commands first to stderr
43
set -o errexit # Exit the script with error if any of the commands fail
54

65
# Supported/used environment variables:

.evergreen/compile.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/bin/sh
2-
set -o xtrace # Write all commands first to stderr
32
set -o errexit # Exit the script with error if any of the commands fail
43

54
OS=$(uname -s | tr '[:upper:]' '[:lower:]')

0 commit comments

Comments
 (0)