Skip to content

Commit 6a547f2

Browse files
committed
Use correct driver for osx
1 parent f252551 commit 6a547f2

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

eng/helix/content/runtests.sh

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
dotnet_sdk_version="$2"
44
dotnet_runtime_version="$3"
5+
helixQueue="$5"
56
installPlaywright="${10}"
67

78
RESET="\033[0m"
@@ -28,7 +29,11 @@ export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
2829

2930
# Set playwright stuff
3031
export PLAYWRIGHT_BROWSERS_PATH="$DIR/ms-playwright"
31-
export PLAYWRIGHT_DRIVER_PATH="$DIR/.playwright/unix/native/playwright.sh"
32+
if [[ "$helixQueue" == *"OSX"* ]]; then
33+
export PLAYWRIGHT_DRIVER_PATH="$DIR/.playwright/osx/native/playwright.sh"
34+
else
35+
export PLAYWRIGHT_DRIVER_PATH="$DIR/.playwright/unix/native/playwright.sh"
36+
fi
3237
export InstallPlaywright="$installPlaywright"
3338
if [ -f "$PLAYWRIGHT_DRIVER_PATH" ]; then
3439
echo "chmod +x $PLAYWRIGHT_DRIVER_PATH"
@@ -96,8 +101,8 @@ exit_code=0
96101
echo "Restore: $DOTNET_ROOT/dotnet restore RunTests/RunTests.csproj --ignore-failed-sources"
97102
$DOTNET_ROOT/dotnet restore RunTests/RunTests.csproj --ignore-failed-sources
98103

99-
echo "Running tests: $DOTNET_ROOT/dotnet run --no-restore --project RunTests/RunTests.csproj -- --target $1 --runtime $4 --queue $5 --arch $6 --quarantined $7 --ef $8 --helixTimeout $9"
100-
$DOTNET_ROOT/dotnet run --no-restore --project RunTests/RunTests.csproj -- --target $1 --runtime $4 --queue $5 --arch $6 --quarantined $7 --ef $8 --helixTimeout $9
104+
echo "Running tests: $DOTNET_ROOT/dotnet run --no-restore --project RunTests/RunTests.csproj -- --target $1 --runtime $4 --queue $helixQueue --arch $6 --quarantined $7 --ef $8 --helixTimeout $9"
105+
$DOTNET_ROOT/dotnet run --no-restore --project RunTests/RunTests.csproj -- --target $1 --runtime $4 --queue $helixQueue --arch $6 --quarantined $7 --ef $8 --helixTimeout $9
101106
exit_code=$?
102107
echo "Finished tests...exit_code=$exit_code"
103108

0 commit comments

Comments
 (0)