Skip to content

Commit 26a788e

Browse files
committed
Updating build scripts to allow execution of .NET tests
1 parent 74a7ba5 commit 26a788e

File tree

2 files changed

+24
-6
lines changed

2 files changed

+24
-6
lines changed

dotnet/test/edge/build.desc

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
dotnet_test(name = "edge",
2+
srcs = "**/*.cs",
3+
refs = [
4+
"System.dll",
5+
"System.Core.dll",
6+
"System.Data.dll",
7+
"System.Drawing.dll",
8+
"System.Xml.dll",
9+
"//dotnet/src/webdriver:webdriver",
10+
"//dotnet/test/common:common",
11+
"third_party/dotnet/nunit-3.2.1/net-4.0/nunit.framework.dll"
12+
],
13+
out = "WebDriver.Edge.Tests.dll",
14+
files = [
15+
"WebDriver.Edge.Tests.config",
16+
"WebDriver.Edge.Tests.nunit"
17+
],
18+
project = "WebDriver.Edge.Tests.nunit",
19+
omitdocxml = "true"
20+
)

rake-tasks/crazy_fun/mappings/visualstudio.rb

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -384,13 +384,11 @@ def handle(fun, dir, args)
384384
target = nunit "#{task_name}:run" do |nunit_task|
385385
mkdir_p test_log_dir
386386
puts "Testing: #{task_name}"
387-
nunit_task.command = "third_party/dotnet/nunit-2.6.2/nunit-console.exe"
387+
nunit_task.command = "third_party/dotnet/nunit-3.2.1/nunit3-console.exe"
388388
nunit_task.assemblies << [output_dir, args[:project]].join(File::SEPARATOR)
389-
nunit_task.options << "/nologo"
390-
nunit_task.options << "/nodots"
391-
nunit_task.options << "/xml=#{[test_log_dir, args[:project]].join(File::SEPARATOR)}.xml"
392-
nunit_task.output_redirect = "#{[test_log_dir, args[:project]].join(File::SEPARATOR)}.log"
393-
nunit_task.ignore_test_fail = !([nil, 'true'].include? ENV['haltonfailure'])
389+
nunit_task.options << "--agents=1"
390+
nunit_task.options << "--noheader"
391+
nunit_task.options << "--result=#{[test_log_dir, args[:project]].join(File::SEPARATOR)}.xml"
394392
end
395393

396394
add_dependencies(target, dir, args[:deps])

0 commit comments

Comments
 (0)