Skip to content

Commit 27d4ed5

Browse files
ruby-oujoEvergreen Agent
authored andcommitted
Import wiredtiger: 524dd280f76dd1a3ea8b8e6ee7731c8e3c79cede from branch mongodb-master
ref: 7146ad61f6..524dd280f7 for: 7.2.0-rc0 WT-11745 Improve robustness evergreen script
1 parent 57624be commit 27d4ed5

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/third_party/wiredtiger/import.data

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"vendor": "wiredtiger",
33
"github": "wiredtiger/wiredtiger.git",
44
"branch": "mongodb-master",
5-
"commit": "7146ad61f68d19602b025efd0ef05dbfc14c2a49"
5+
"commit": "524dd280f76dd1a3ea8b8e6ee7731c8e3c79cede"
66
}

src/third_party/wiredtiger/test/evergreen/evg_cfg.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ def get_make_check_dirs():
136136
os.chdir(run('git rev-parse --show-toplevel'))
137137

138138
# Find the build folder. It can be identified by the presence of the `CMakeFiles` file.
139-
p = subprocess.Popen("find . -name CMakeFiles -maxdepth 2", stdout=subprocess.PIPE, shell=True,
139+
p = subprocess.Popen("find . -maxdepth 2 -name CMakeFiles", stdout=subprocess.PIPE, shell=True,
140140
universal_newlines=True)
141141
build_folder = os.path.dirname(p.stdout.read().strip())
142142

@@ -271,8 +271,10 @@ def evg_cfg(action, test_type):
271271
# - 'ssh://[email protected]/wiredtiger/wiredtiger.git' (if run through SSH)
272272
# - 'git://github.com/wiredtiger/wiredtiger' (if cloned anonymously)
273273
output = run('git config remote.origin.url')
274-
if not 'github.com' in output or (not 'wiredtiger.git' in output and output != 'git://github.com/wiredtiger/wiredtiger'):
275-
sys.exit("ERROR [%s]: need to run this script inside a wiredtiger repo" % prog)
274+
if not 'github.com' in output or not 'wiredtiger/wiredtiger' in output:
275+
sys.exit(("ERROR [{prog}]: need to run this script inside a wiredtiger repo\n" +
276+
"\t`git config remote.origin.url` returned \"{output}\""
277+
).format(prog=prog, output=output))
276278

277279
# Change directory to repo top level
278280
os.chdir(run('git rev-parse --show-toplevel'))

0 commit comments

Comments
 (0)