Update fetch scripts to download NUnit 3.0.1, and adjust paths
Update Makefile to look for nunit3-console.exe
This commit is contained in:
2
Makefile
2
Makefile
@@ -228,7 +228,7 @@ check: utility mods
|
||||
@echo "Checking for code style violations in OpenRA.Test..."
|
||||
@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Test
|
||||
|
||||
NUNIT_CONSOLE := $(shell test -f thirdparty/download/nunit-console.exe && echo mono thirdparty/download/nunit-console.exe || \
|
||||
NUNIT_CONSOLE := $(shell test -f thirdparty/download/nunit3-console.exe && echo mono thirdparty/download/nunit3-console.exe || \
|
||||
which nunit2-console 2>/dev/null || which nunit3-console 2>/dev/null || which nunit-console 2>/dev/null)
|
||||
nunit: test_dll
|
||||
@echo
|
||||
|
||||
2
thirdparty/fetch-thirdparty-deps.ps1
vendored
2
thirdparty/fetch-thirdparty-deps.ps1
vendored
@@ -62,7 +62,7 @@ if (!(Test-Path "SharpFont.dll"))
|
||||
if (!(Test-Path "nunit.framework.dll"))
|
||||
{
|
||||
echo "Fetching NUnit from NuGet."
|
||||
./nuget.exe install NUnit -Version 2.6.4 -ExcludeVersion
|
||||
./nuget.exe install NUnit -Version 3.0.1 -ExcludeVersion
|
||||
cp NUnit/lib/nunit.framework* .
|
||||
rmdir NUnit -Recurse
|
||||
}
|
||||
|
||||
18
thirdparty/fetch-thirdparty-deps.sh
vendored
18
thirdparty/fetch-thirdparty-deps.sh
vendored
@@ -73,19 +73,17 @@ fi
|
||||
|
||||
if [ ! -f nunit.framework.dll ]; then
|
||||
echo "Fetching NUnit from NuGet"
|
||||
get NUnit 2.6.4
|
||||
cp ./NUnit/lib/nunit.framework* .
|
||||
get NUnit 3.0.1
|
||||
cp ./NUnit/lib/net40/nunit.framework* .
|
||||
rm -rf NUnit
|
||||
fi
|
||||
|
||||
if [ ! -f nunit-console.exe ]; then
|
||||
echo "Fetching NUnit.Runners from NuGet"
|
||||
get NUnit.Runners 2.6.4
|
||||
cp ./NUnit.Runners/tools/nunit-console.exe .
|
||||
chmod +x nunit-console.exe
|
||||
cp ./NUnit.Runners/tools/nunit-console.exe.config .
|
||||
cp -R ./NUnit.Runners/tools/lib .
|
||||
rm -rf NUnit.Runners
|
||||
if [ ! -f nunit3-console.exe ]; then
|
||||
echo "Fetching NUnit.Console from NuGet"
|
||||
get NUnit.Console 3.0.1
|
||||
cp -R ./NUnit.Console/tools/* .
|
||||
chmod +x nunit3-console.exe
|
||||
rm -rf NUnit.Console
|
||||
fi
|
||||
|
||||
if [ ! -f Mono.Nat.dll ]; then
|
||||
|
||||
Reference in New Issue
Block a user