epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update fetch scripts to download NUnit 3.0.1, and adjust paths

Browse Source 
Update Makefile to look for nunit3-console.exe
This commit is contained in:
Piët Delport
2015-12-28 16:06:07 +02:00
parent c372d966b4
commit e9faad8224
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -228,7 +228,7 @@ check: utility mods
@echo "Checking for code style violations in OpenRA.Test..." @echo "Checking for code style violations in OpenRA.Test..."
@mono --debug OpenRA.Utility.exe ra --check-code-style 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) which nunit2-console 2>/dev/null || which nunit3-console 2>/dev/null || which nunit-console 2>/dev/null)
nunit: test_dll nunit: test_dll
@echo @echo

2
thirdparty/fetch-thirdparty-deps.ps1 vendored
View File

@@ -62,7 +62,7 @@ if (!(Test-Path "SharpFont.dll"))
if (!(Test-Path "nunit.framework.dll")) if (!(Test-Path "nunit.framework.dll"))
{ {
echo "Fetching NUnit from NuGet." 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* . cp NUnit/lib/nunit.framework* .
rmdir NUnit -Recurse rmdir NUnit -Recurse
} }

18
thirdparty/fetch-thirdparty-deps.sh vendored
View File

@@ -73,19 +73,17 @@ fi
if [ ! -f nunit.framework.dll ]; then if [ ! -f nunit.framework.dll ]; then
echo "Fetching NUnit from NuGet" echo "Fetching NUnit from NuGet"
get NUnit 2.6.4 get NUnit 3.0.1
cp ./NUnit/lib/nunit.framework* . cp ./NUnit/lib/net40/nunit.framework* .
rm -rf NUnit rm -rf NUnit
fi fi
if [ ! -f nunit-console.exe ]; then if [ ! -f nunit3-console.exe ]; then
echo "Fetching NUnit.Runners from NuGet" echo "Fetching NUnit.Console from NuGet"
get NUnit.Runners 2.6.4 get NUnit.Console 3.0.1
cp ./NUnit.Runners/tools/nunit-console.exe . cp -R ./NUnit.Console/tools/* .
chmod +x nunit-console.exe chmod +x nunit3-console.exe
cp ./NUnit.Runners/tools/nunit-console.exe.config . rm -rf NUnit.Console
cp -R ./NUnit.Runners/tools/lib .
rm -rf NUnit.Runners
fi fi
if [ ! -f Mono.Nat.dll ]; then if [ ! -f Mono.Nat.dll ]; then