Skip to content

Commit 30524a1

Browse files
ajdaviskevinAlbs
authored andcommitted
CDRIVER-2505 fix some Windows paths
1 parent ea7b81d commit 30524a1

File tree

5 files changed

+13
-12
lines changed

5 files changed

+13
-12
lines changed

.evergreen/compile-windows.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,12 @@ esac
114114
if [ "$RELEASE" ]; then
115115
CONFIGURE_FLAGS="$CONFIGURE_FLAGS -DCMAKE_BUILD_TYPE=Release"
116116
BUILD_FLAGS="$BUILD_FLAGS /p:Configuration=Release"
117-
TEST_PATH="./Release/src/libmongoc/test-libmongoc.exe"
117+
TEST_PATH="./src/libmongoc/Release/test-libmongoc.exe"
118118
export PATH=$PATH:`pwd`/tests:`pwd`/Release:`pwd`/src/libbson/Release:`pwd`/src/libmongoc/Release
119119
else
120120
CONFIGURE_FLAGS="$CONFIGURE_FLAGS -DCMAKE_BUILD_TYPE=Debug"
121121
BUILD_FLAGS="$BUILD_FLAGS /p:Configuration=Debug"
122-
TEST_PATH="./Debug/src/libmongoc/test-libmongoc.exe"
122+
TEST_PATH="./src/libmongoc/Debug/test-libmongoc.exe"
123123
export PATH=$PATH:`pwd`/tests:`pwd`/Debug:`pwd`/src/libbson/Debug:`pwd`/src/libmongoc/Debug
124124
fi
125125

.evergreen/run-auth-tests.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ DIR=$(dirname $0)
3838

3939
case "$OS" in
4040
cygwin*)
41-
PING="./Debug/src/libmongoc/mongoc-ping.exe"
42-
TEST_GSSAPI="./Debug/src/libmongoc/test-mongoc-gssapi.exe"
41+
PING="./src/libmongoc/Debug/mongoc-ping.exe"
42+
TEST_GSSAPI="./src/libmongoc/Debug/test-mongoc-gssapi.exe"
4343
IP_ADDR=`getent hosts $AUTH_HOST | head -n 1 | awk '{print $1}'`
4444
;;
4545

.evergreen/run-tests-bson.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ fi
1818

1919
case "$OS" in
2020
cygwin*)
21-
export PATH=$PATH:`pwd`/tests:`pwd`/Debug:`pwd`/src/libbson/Debug
22-
chmod +x ./Debug/* src/libbson/Debug/* || true
21+
export PATH=$PATH:`pwd`/src/libbson/Debug
22+
chmod +x src/libmongoc/Debug/* src/libbson/Debug/* || true
2323
;;
2424
esac
2525

.evergreen/run-tests.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ if [ "$CC" = "mingw" ]; then
5858
echo "ERROR - DNS tests not implemented for MinGW yet"
5959
exit 1
6060
fi
61-
chmod +x ./src/libmongoc/test-libmongoc.exe
61+
chmod +x ./src/libmongoc/Debug/test-libmongoc.exe
6262
cmd.exe /c .evergreen\\run-tests-mingw.bat
6363
exit 0
6464
fi
@@ -69,7 +69,8 @@ DIR=$(dirname $0)
6969

7070
case "$OS" in
7171
cygwin*)
72-
./src/libmongoc/test-libmongoc.exe $TEST_ARGS
72+
chmod +x src/libmongoc/Debug/test-libmongoc.exe
73+
./src/libmongoc/Debug/test-libmongoc.exe $TEST_ARGS
7374
;;
7475

7576
*)

.evergreen/set-path.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ set_path ()
55
{
66
case "$OS" in
77
cygwin*)
8-
export PATH=$PATH:`pwd`/tests:`pwd`/Debug:`pwd`/src/libbson/Debug
9-
export PATH=$PATH:`pwd`/tests:`pwd`/Release:`pwd`/src/libbson/Release
10-
chmod +x ./Debug/* src/libbson/Debug/* || true
11-
chmod +x ./Release/* src/libbson/Release/* || true
8+
export PATH=$PATH:`pwd`/src/libbson/Debug
9+
export PATH=$PATH:`pwd`/src/libbson/Release
10+
chmod +x src/libmongoc/Debug/* src/libbson/Debug/* || true
11+
chmod +x src/libmongoc/Release/* src/libbson/Release/* || true
1212
;;
1313

1414
darwin)

0 commit comments

Comments
 (0)