Skip to content

Commit

Permalink
Updating build process for .NET tests to use Buck
Browse files Browse the repository at this point in the history
  • Loading branch information
@jimevans
jimevans committed Feb 11, 2018
1 parent d13c060 commit 77ff29c
Show file tree
Hide file tree
Showing 21 changed files with 166 additions and 172 deletions.
16 changes: 8 additions & 8 deletions dotnet/src/support/BUCK
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,31 @@ genrule(
srcs = [ 'WebDriver.Support.csproj' ],
bash = "echo '$(location //dotnet/src/webdriver:net35)' && dotnet build $SRCS --configuration Release --framework net35 --output $OUT /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:IntermediateOutputPath=$OUT/../obj/ /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
cmd_exe = "echo '$(location //dotnet/src/webdriver:net35)' && dotnet build %SRCS% --configuration Release --framework net35 --output %OUT% /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:IntermediateOutputPath=%OUT%\..\obj\ /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
out = 'net35'
out = 'bin'
)

genrule(
name = 'net40',
srcs = [ 'WebDriver.Support.csproj' ],
bash = "echo '$(location //dotnet/src/webdriver:net40)' && dotnet build $SRCS --configuration Release --framework net40 --output $OUT /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:IntermediateOutputPath=$OUT/../obj/ /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
cmd_exe = "echo '$(location //dotnet/src/webdriver:net40)' && dotnet build %SRCS% --configuration Release --framework net40 --output %OUT% /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:IntermediateOutputPath=%OUT%\..\obj\ /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
out = 'net40'
out = 'bin'
)

genrule(
name = 'net45',
srcs = [ 'WebDriver.Support.csproj' ],
bash = "echo '$(location //dotnet/src/webdriver:net45)' && dotnet build $SRCS --configuration Release --framework net45 --output $OUT /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:IntermediateOutputPath=$OUT/../obj/ /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
cmd_exe = "echo '$(location //dotnet/src/webdriver:net45)' && dotnet build %SRCS% --configuration Release --framework net45 --output %OUT% /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:IntermediateOutputPath=%OUT%\..\obj\ /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
out = 'net45'
out = 'bin'
)

genrule(
name = 'netstandard2.0',
srcs = [ 'WebDriver.Support.csproj' ],
bash = "echo '$(location //dotnet/src/webdriver:netstandard2.0)' && dotnet build $SRCS --configuration Release --framework netstandard2.0 --output $OUT /p:Version={} /p:AssemblyVersion={} /p:IntermediateOutputPath=$OUT/../obj/ /p:FileVersion={} /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
cmd_exe = "echo '$(location //dotnet/src/webdriver:netstandard2.0)' && dotnet build %SRCS% --configuration Release --framework netstandard2.0 --output %OUT% /p:Version={} /p:AssemblyVersion={} /p:IntermediateOutputPath=%OUT%\..\obj\ /p:FileVersion={} /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
out = 'netstandard2.0'
out = 'bin'
)

genrule(
Expand Down Expand Up @@ -68,28 +68,28 @@ genrule(
name = 'net35_strongnamed',
srcs = [ 'WebDriver.Support.csproj' ],
cmd = "echo '$(location //dotnet/src/webdriver:net35_strongnamed)' && dotnet build %SRCS% --configuration Release --framework net35 --output %OUT% /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$(location //dotnet:keyfile) /p:Version={} /p:AssemblyVersion={} /p:IntermediateOutputPath=%OUT%\..\obj\ /p:FileVersion={} /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
out = 'net35'
out = 'bin'
)

genrule(
name = 'net40_strongnamed',
srcs = [ 'WebDriver.Support.csproj' ],
cmd = "echo '$(location //dotnet/src/webdriver:net40_strongnamed)' && dotnet build %SRCS% --configuration Release --framework net40 --output %OUT% /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$(location //dotnet:keyfile) /p:Version={} /p:AssemblyVersion={} /p:IntermediateOutputPath=%OUT%\..\obj\ /p:FileVersion={} /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
out = 'net40'
out = 'bin'
)

genrule(
name = 'net45_strongnamed',
srcs = [ 'WebDriver.Support.csproj' ],
cmd = "echo '$(location //dotnet/src/webdriver:net45_strongnamed)' && dotnet build %SRCS% --configuration Release --framework net45 --output %OUT% /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$(location //dotnet:keyfile) /p:Version={} /p:AssemblyVersion={} /p:IntermediateOutputPath=%OUT%\..\obj\ /p:FileVersion={} /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
out = 'net45'
out = 'bin'
)

genrule(
name = 'netstandard2.0_strongnamed',
srcs = [ 'WebDriver.Support.csproj' ],
cmd = "echo '$(location //dotnet/src/webdriver:netstandard2.0_strongnamed)' && dotnet build %SRCS% --configuration Release --framework netstandard2.0 --output %OUT% /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$(location //dotnet:keyfile) /p:Version={} /p:IntermediateOutputPath=%OUT%\..\obj\ /p:AssemblyVersion={} /p:FileVersion={} /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
out = 'netstandard2.0'
out = 'bin'
)

genrule(
Expand Down
19 changes: 10 additions & 9 deletions dotnet/src/webdriver/BUCK
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ genrule(
srcs = [ 'WebDriver.csproj' ],
bash = "echo '$(location :webdriver_deps)' && dotnet build $SRCS --configuration Release --framework net35 --output $OUT /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:IntermediateOutputPath=$OUT/../obj/ /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
cmd_exe = "echo '$(location :webdriver_deps)' && dotnet build %SRCS% --configuration Release --framework net35 --output %OUT% /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:IntermediateOutputPath=%OUT%\..\obj\ /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
out = 'net35',
out = 'bin',
visibility = [
'//dotnet/src/webdriverbackedselenium:net35',
'//dotnet/src/support:net35'
Expand All @@ -18,7 +18,7 @@ genrule(
srcs = [ 'WebDriver.csproj' ],
bash = "echo '$(location :webdriver_deps)' && dotnet build $SRCS --configuration Release --framework net40 --output $OUT /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:IntermediateOutputPath=$OUT/../obj/ /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
cmd_exe = "echo '$(location :webdriver_deps)' && dotnet build %SRCS% --configuration Release --framework net40 --output %OUT% /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:IntermediateOutputPath=%OUT%\..\obj\ /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
out = 'net40',
out = 'bin',
visibility = [
'//dotnet/src/webdriverbackedselenium:net40',
'//dotnet/src/support:net40'
Expand All @@ -30,10 +30,11 @@ genrule(
srcs = [ 'WebDriver.csproj' ],
bash = "echo '$(location :webdriver_deps)' && dotnet build $SRCS --configuration Release --framework net45 --output $OUT /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:IntermediateOutputPath=$OUT/../obj/ /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
cmd_exe = "echo '$(location :webdriver_deps)' && dotnet build %SRCS% --configuration Release --framework net45 --output %OUT% /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:IntermediateOutputPath=%OUT%\..\obj\ /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
out = 'net45',
out = 'bin',
visibility = [
'//dotnet/src/webdriverbackedselenium:net45',
'//dotnet/src/support:net45'
'//dotnet/src/support:net45',
'//dotnet/test/...'
]
)

Expand All @@ -42,7 +43,7 @@ genrule(
srcs = [ 'WebDriver.csproj' ],
bash = "echo '$(location :webdriver_deps)' && dotnet build $SRCS --configuration Release --framework netstandard2.0 --output $OUT /p:Version={} /p:AssemblyVersion={} /p:IntermediateOutputPath=$OUT/../obj/ /p:FileVersion={} /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
cmd_exe = "echo '$(location :webdriver_deps)' && dotnet build %SRCS% --configuration Release --framework netstandard2.0 --output %OUT% /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:IntermediateOutputPath=%OUT%\..\obj\ /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
out = 'netstandard2.0',
out = 'bin',
visibility = [
'//dotnet/src/webdriverbackedselenium:netstandard2.0',
'//dotnet/src/support:netstandard2.0'
Expand Down Expand Up @@ -82,7 +83,7 @@ genrule(
name = 'net35_strongnamed',
srcs = [ 'WebDriver.csproj' ],
cmd = "echo '$(location :webdriver_deps)' && dotnet build %SRCS% --configuration Release --framework net35 --output %OUT% /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$(location //dotnet:keyfile) /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:IntermediateOutputPath=%OUT%\..\obj\ /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
out = 'net35',
out = 'bin',
visibility = [
'//dotnet/src/webdriverbackedselenium:net35_strongnamed',
'//dotnet/src/support:net35_strongnamed'
Expand All @@ -93,7 +94,7 @@ genrule(
name = 'net40_strongnamed',
srcs = [ 'WebDriver.csproj' ],
cmd = "echo '$(location :webdriver_deps)' && dotnet build %SRCS% --configuration Release --framework net40 --output %OUT% /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$(location //dotnet:keyfile) /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:IntermediateOutputPath=%OUT%\..\obj\ /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
out = 'net40',
out = 'bin',
visibility = [
'//dotnet/src/webdriverbackedselenium:net40_strongnamed',
'//dotnet/src/support:net40_strongnamed'
Expand All @@ -104,7 +105,7 @@ genrule(
name = 'net45_strongnamed',
srcs = [ 'WebDriver.csproj' ],
cmd = "echo '$(location :webdriver_deps)' && dotnet build %SRCS% --configuration Release --framework net45 --output %OUT% /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$(location //dotnet:keyfile) /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:IntermediateOutputPath=%OUT%\..\obj\ /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
out = 'net45',
out = 'bin',
visibility = [
'//dotnet/src/webdriverbackedselenium:net45_strongnamed',
'//dotnet/src/support:net45_strongnamed'
Expand All @@ -115,7 +116,7 @@ genrule(
name = 'netstandard2.0_strongnamed',
srcs = [ 'WebDriver.csproj' ],
cmd = "echo '$(location :webdriver_deps)' && dotnet build %SRCS% --configuration Release --framework netstandard2.0 --output %OUT% /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$(location //dotnet:keyfile) /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:IntermediateOutputPath=%OUT%\..\obj\ /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
out = 'netstandard2.0',
out = 'bin',
visibility = [
'//dotnet/src/webdriverbackedselenium:netstandard2.0_strongnamed',
'//dotnet/src/support:netstandard2.0_strongnamed'
Expand Down
16 changes: 8 additions & 8 deletions dotnet/src/webdriverbackedselenium/BUCK
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,31 @@ genrule(
srcs = [ 'Selenium.WebDriverBackedSelenium.csproj' ],
bash = "echo '$(location :webdriverbackedselenium_deps)' && echo '$(location //dotnet/src/webdriver:net35)' && dotnet build $SRCS --configuration Release --framework net35 --output $OUT /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:IntermediateOutputPath=$OUT/../obj/ /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
cmd_exe = "echo '$(location :webdriverbackedselenium_deps)' && echo '$(location //dotnet/src/webdriver:net35)' && dotnet build %SRCS% --configuration Release --framework net35 --output %OUT% /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:IntermediateOutputPath=%OUT%\..\obj\ /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
out = 'net35'
out = 'bin'
)

genrule(
name = 'net40',
srcs = [ 'Selenium.WebDriverBackedSelenium.csproj' ],
bash = "echo '$(location :webdriverbackedselenium_deps)' && echo '$(location //dotnet/src/webdriver:net40)' && dotnet build $SRCS --configuration Release --framework net40 --output $OUT /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:IntermediateOutputPath=$OUT/../obj/ /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
cmd_exe = "echo '$(location :webdriverbackedselenium_deps)' && echo '$(location //dotnet/src/webdriver:net40)' && dotnet build %SRCS% --configuration Release --framework net40 --output %OUT% /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:IntermediateOutputPath=%OUT%\..\obj\ /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
out = 'net40'
out = 'bin'
)

genrule(
name = 'net45',
srcs = [ 'Selenium.WebDriverBackedSelenium.csproj' ],
bash = "echo '$(location :webdriverbackedselenium_deps)' && echo '$(location //dotnet/src/webdriver:net45)' && dotnet build $SRCS --configuration Release --framework net45 --output $OUT /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:IntermediateOutputPath=$OUT/../obj/ /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
cmd_exe = "echo '$(location :webdriverbackedselenium_deps)' && echo '$(location //dotnet/src/webdriver:net45)' && dotnet build %SRCS% --configuration Release --framework net45 --output %OUT% /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:IntermediateOutputPath=%OUT%\..\obj\ /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
out = 'net45'
out = 'bin'
)

genrule(
name = 'netstandard2.0',
srcs = [ 'Selenium.WebDriverBackedSelenium.csproj' ],
bash = "echo '$(location :webdriverbackedselenium_deps)' && echo '$(location //dotnet/src/webdriver:netstandard2.0)' && dotnet build $SRCS --configuration Release --framework netstandard2.0 --output $OUT /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:IntermediateOutputPath=$OUT/../obj/ /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
cmd_exe = "echo '$(location :webdriverbackedselenium_deps)' && echo '$(location //dotnet/src/webdriver:netstandard2.0)' && dotnet build %SRCS% --configuration Release --framework netstandard2.0 --output %OUT% /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:IntermediateOutputPath=%OUT%\..\obj\ /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
out = 'netstandard2.0'
out = 'bin'
)

genrule(
Expand Down Expand Up @@ -68,28 +68,28 @@ genrule(
name = 'net35_strongnamed',
srcs = [ 'Selenium.WebDriverBackedSelenium.csproj' ],
cmd = "echo '$(location :webdriverbackedselenium_deps)' && echo '$(location //dotnet/src/webdriver:net35_strongnamed)' && dotnet build %SRCS% --configuration Release --framework net35 --output %OUT% /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$(location //dotnet:keyfile) /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:IntermediateOutputPath=%OUT%\..\obj\ /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
out = 'net35'
out = 'bin'
)

genrule(
name = 'net40_strongnamed',
srcs = [ 'Selenium.WebDriverBackedSelenium.csproj' ],
cmd = "echo '$(location :webdriverbackedselenium_deps)' && echo '$(location //dotnet/src/webdriver:net40_strongnamed)' && dotnet build %SRCS% --configuration Release --framework net40 --output %OUT% /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$(location //dotnet:keyfile) /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:IntermediateOutputPath=%OUT%\..\obj\ /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
out = 'net40'
out = 'bin'
)

genrule(
name = 'net45_strongnamed',
srcs = [ 'Selenium.WebDriverBackedSelenium.csproj' ],
cmd = "echo '$(location :webdriverbackedselenium_deps)' && echo '$(location //dotnet/src/webdriver:net45_strongnamed)' && dotnet build %SRCS% --configuration Release --framework net45 --output %OUT% /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$(location //dotnet:keyfile) /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:IntermediateOutputPath=%OUT%\..\obj\ /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
out = 'net45'
out = 'bin'
)

genrule(
name = 'netstandard2.0_strongnamed',
srcs = [ 'Selenium.WebDriverBackedSelenium.csproj' ],
cmd = "echo '$(location :webdriverbackedselenium_deps)' && echo '$(location //dotnet/src/webdriver:netstandard2.0_strongnamed)' && dotnet build %SRCS% --configuration Release --framework netstandard2.0 --output %OUT% /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$(location //dotnet:keyfile) /p:Version={} /p:AssemblyVersion={} /p:IntermediateOutputPath=%OUT%\..\obj\ /p:FileVersion={} /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
out = 'netstandard2.0'
out = 'bin'
)

genrule(
Expand Down
18 changes: 18 additions & 0 deletions dotnet/test/chrome/BUCK
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
genrule(
name = 'net45',
srcs = [ 'WebDriver.Chrome.Tests.csproj' ],
bash = "echo '$(location //dotnet/test/common:net45)' && dotnet build $SRCS --configuration Release --framework net45 --output $OUT /p:IntermediateOutputPath=$OUT/../obj/ /p:BuildSystem=buck",
cmd_exe = "echo '$(location //dotnet/test/common:net45)' && dotnet build %SRCS% --configuration Release --framework net45 --output %OUT% /p:IntermediateOutputPath=%OUT%\..\obj\ /p:BuildSystem=buck",
out = 'bin'
)

genrule(
name = 'webdriver_deps',
srcs = [
'//java/client/test/org/openqa/selenium/environment:webserver',
'//dotnet/src/webdriver:net45',
],
bash = 'echo "$SRCS" > $OUT',
cmd_exe = 'echo "%SRCS%" > %OUT%',
out = 'deps.txt'
)
20 changes: 0 additions & 20 deletions dotnet/test/chrome/build.desc
View file

This file was deleted.

21 changes: 21 additions & 0 deletions dotnet/test/common/BUCK
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
genrule(
name = 'net45',
srcs = [ 'WebDriver.Common.Tests.csproj' ],
bash = "echo '$(location :webdriver_deps)' && dotnet build $SRCS --configuration Release --framework net45 --output $OUT /p:IntermediateOutputPath=$OUT/../obj/ /p:BuildSystem=buck",
cmd_exe = "echo '$(location :webdriver_deps)' && dotnet build %SRCS% --configuration Release --framework net45 --output %OUT% /p:IntermediateOutputPath=%OUT%\..\obj\ /p:BuildSystem=buck",
out = 'bin',
visibility = [
'//dotnet/test/...'
]
)

genrule(
name = 'webdriver_deps',
srcs = [
'//java/client/test/org/openqa/selenium/environment:webserver',
'//dotnet/src/webdriver:net45',
],
bash = 'echo "$SRCS" > $OUT',
cmd_exe = 'echo "%SRCS%" > %OUT%',
out = 'deps.txt'
)
5 changes: 3 additions & 2 deletions dotnet/test/common/Environment/EnvironmentManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,10 @@ private EnvironmentManager()
TestEnvironment env = JsonConvert.DeserializeObject<TestEnvironment>(content);
string activeDriverConfig = TestContext.Parameters.Get("ActiveDriverConfig", env.ActiveDriverConfig);
string activeWebsiteConfig = TestContext.Parameters.Get("ActiveWebsiteConfig", env.ActiveWebsiteConfig);
string driverServiceLocation = TestContext.Parameters.Get("DriverServiceLocation", env.DriverServiceLocation);
DriverConfig driverConfig = env.DriverConfigs[activeDriverConfig];
WebsiteConfig websiteConfig = env.WebSiteConfigs[activeWebsiteConfig];
this.driverFactory = new DriverFactory(env.DriverServiceLocation);
this.driverFactory = new DriverFactory(driverServiceLocation);

Assembly driverAssembly = Assembly.Load(driverConfig.AssemblyName);
driverType = driverAssembly.GetType(driverConfig.DriverTypeName);
Expand All @@ -37,7 +38,7 @@ private EnvironmentManager()
urlBuilder = new UrlBuilder(websiteConfig);

DirectoryInfo info = new DirectoryInfo(currentDirectory);
while (info != info.Root && string.Compare(info.Name, "build", StringComparison.OrdinalIgnoreCase) != 0)
while (info != info.Root && string.Compare(info.Name, "buck-out", StringComparison.OrdinalIgnoreCase) != 0 && string.Compare(info.Name, "build", StringComparison.OrdinalIgnoreCase) != 0)
{
info = info.Parent;
}
Expand Down
Loading

0 comments on commit 77ff29c

Please sign in to comment.