Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitmodules3
-rw-r--r--Makefile2
-rw-r--r--main/Makefile.am2
-rw-r--r--main/contrib/ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj1
m---------main/external/mdtestharness0
-rw-r--r--main/tests/MacPlatform.Tests/MacPlatform.Tests.csproj10
-rw-r--r--main/tests/MacPlatform.Tests/MyClass.cs36
-rw-r--r--main/tests/Makefile.am19
-rw-r--r--main/tests/MonoDevelop.MacDev.Tests/MonoDevelop.MacDev.Tests.csproj11
-rw-r--r--main/tests/UnitTests/UnitTests.csproj69
-rw-r--r--main/tests/UserInterfaceTests/UserInterfaceTests.csproj4
11 files changed, 81 insertions, 76 deletions
diff --git a/.gitmodules b/.gitmodules
index 39a3a997a7..1eab27d5f2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,6 @@
[submodule "main/external/ngit"]
path = main/external/ngit
url = git://github.com/mono/ngit.git
+[submodule "main/external/mdtestharness"]
+ path = main/external/mdtestharness
+ url = git://github.com/alanmcgovern/mdtestharness.git
diff --git a/Makefile b/Makefile
index 83acdf5ee2..6eb45e7ca9 100644
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,7 @@ run-gdb:
cd main && $(MAKE) run-gdb
test:
- cd main/tests/UnitTests && $(MAKE) test fixture=$(fixture)
+ cd main && $(MAKE) test
check-addins:
cd main && $(MAKE) check-addins
diff --git a/main/Makefile.am b/main/Makefile.am
index 1f95c855f7..90fc6db00b 100644
--- a/main/Makefile.am
+++ b/main/Makefile.am
@@ -137,7 +137,7 @@ check-addins:
$(MDTOOL_RUN) setup reg-build -v
test:
- cd tests/UnitTests && make test fixture=$(fixture)
+ cd tests && make test
app-dir: all
cd build && make app-dir
diff --git a/main/contrib/ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj b/main/contrib/ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj
index 507d6538e3..6826e2a57d 100644
--- a/main/contrib/ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj
+++ b/main/contrib/ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj
@@ -251,7 +251,6 @@
<Compile Include="Semantics\InitializedObjectResolveResult.cs" />
</ItemGroup>
<ItemGroup />
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<ProjectReference Include="..\..\external\cecil\Mono.Cecil.csproj">
<Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
diff --git a/main/external/mdtestharness b/main/external/mdtestharness
new file mode 160000
+Subproject 424f53e08c48dee8accaa68820b1cd7147cf1ba
diff --git a/main/tests/MacPlatform.Tests/MacPlatform.Tests.csproj b/main/tests/MacPlatform.Tests/MacPlatform.Tests.csproj
index f28bc17ed7..d887cff46b 100644
--- a/main/tests/MacPlatform.Tests/MacPlatform.Tests.csproj
+++ b/main/tests/MacPlatform.Tests/MacPlatform.Tests.csproj
@@ -14,7 +14,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>bin\Debug</OutputPath>
+ <OutputPath>..\..\build\tests</OutputPath>
<DefineConstants>DEBUG;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -23,19 +23,19 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
<Optimize>true</Optimize>
- <OutputPath>bin\Release</OutputPath>
+ <OutputPath>..\..\build\tests</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
- <Reference Include="MonoMac">
- <HintPath>..\..\..\extras\MonoDevelop.MonoMac\MonoDevelop.MonoMac\MonoMac.dll</HintPath>
- </Reference>
<Reference Include="nunit.framework">
<HintPath>..\..\src\addins\NUnit\lib\nunit.framework.dll</HintPath>
</Reference>
+ <Reference Include="MonoMac">
+ <HintPath>..\..\external\monomac\src\MonoMac.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="AssemblyInfo.cs" />
diff --git a/main/tests/MacPlatform.Tests/MyClass.cs b/main/tests/MacPlatform.Tests/MyClass.cs
deleted file mode 100644
index 6a573027f5..0000000000
--- a/main/tests/MacPlatform.Tests/MyClass.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-//
-// MyClass.cs
-//
-// Author:
-// alanmcgovern <${AuthorEmail}>
-//
-// Copyright (c) 2012 alanmcgovern
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-namespace MacPlatform.Tests
-{
- public class MyClass
- {
- public MyClass ()
- {
- }
- }
-}
-
diff --git a/main/tests/Makefile.am b/main/tests/Makefile.am
index 72aa268564..00af1c7d43 100644
--- a/main/tests/Makefile.am
+++ b/main/tests/Makefile.am
@@ -1,7 +1,22 @@
+include $(top_srcdir)/Makefile.include
+
+MONO=mono
+HARNESS=$(top_srcdir)/external/mdtestharness/nunit-console-x86.exe
+RUN_TEST=$(MD_LAUNCH_SETUP) $(MONO) $(HARNESS)
+TEST_DIR=$(top_builddir)/build/tests
+
if ENABLE_TESTS
-SUBDIRS = UnitTests
-
+all:
+ xbuild MacPlatform.Tests/MacPlatform.Tests.csproj
+ xbuild MonoDevelop.MacDev.Tests/MonoDevelop.MacDev.Tests.csproj
+ xbuild UnitTests/UnitTests.csproj
+
+test:
+ $(RUN_TEST) $(TEST_DIR)/MacPlatform.Tests.dll
+ $(RUN_TEST) $(TEST_DIR)/MonoDevelop.MacDev.Tests.dll
+ $(RUN_TEST) $(TEST_DIR)/UnitTests.dll
+
EXTRA_DIST = \
test-projects/resources-tester/ResourcesTester/Subfolder/FormFile2.cs \
test-projects/resources-tester/ResourcesTester/Subfolder/FormFile2.Designer.cs \
diff --git a/main/tests/MonoDevelop.MacDev.Tests/MonoDevelop.MacDev.Tests.csproj b/main/tests/MonoDevelop.MacDev.Tests/MonoDevelop.MacDev.Tests.csproj
index bd0aef0879..ba4893b52e 100644
--- a/main/tests/MonoDevelop.MacDev.Tests/MonoDevelop.MacDev.Tests.csproj
+++ b/main/tests/MonoDevelop.MacDev.Tests/MonoDevelop.MacDev.Tests.csproj
@@ -14,7 +14,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>bin\Debug</OutputPath>
+ <OutputPath>..\..\build\tests</OutputPath>
<DefineConstants>DEBUG;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -23,7 +23,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
<Optimize>true</Optimize>
- <OutputPath>bin\Release</OutputPath>
+ <OutputPath>..\..\build\tests</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
@@ -31,14 +31,13 @@
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Xml" />
- <Reference Include="MonoMac, Version=0.0.0.0, Culture=neutral">
- <Package>monodevelop-core-mac-addins</Package>
- <SpecificVersion>False</SpecificVersion>
- </Reference>
<Reference Include="System.Core" />
<Reference Include="nunit.framework">
<HintPath>..\..\src\addins\NUnit\lib\nunit.framework.dll</HintPath>
</Reference>
+ <Reference Include="MonoMac">
+ <HintPath>..\..\external\monomac\src\MonoMac.dll</HintPath>
+ </Reference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>
diff --git a/main/tests/UnitTests/UnitTests.csproj b/main/tests/UnitTests/UnitTests.csproj
index da6655dbbc..d3b2a17cb4 100644
--- a/main/tests/UnitTests/UnitTests.csproj
+++ b/main/tests/UnitTests/UnitTests.csproj
@@ -14,7 +14,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>true</Optimize>
- <OutputPath>..\..\build\bin</OutputPath>
+ <OutputPath>..\..\build\tests</OutputPath>
<DefineConstants>DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -26,7 +26,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
<Optimize>true</Optimize>
- <OutputPath>bin\Release</OutputPath>
+ <OutputPath>..\..\build\tests</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
@@ -84,98 +84,123 @@
<ProjectReference Include="..\..\src\core\MonoDevelop.Core\MonoDevelop.Core.csproj">
<Project>{7525BB88-6142-4A26-93B9-A30C6983390A}</Project>
<Name>MonoDevelop.Core</Name>
- <Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\src\addins\Deployment\MonoDevelop.Deployment\MonoDevelop.Deployment.csproj">
<Project>{9BC670A8-1851-40EC-9685-279F4C98433D}</Project>
<Name>MonoDevelop.Deployment</Name>
- <Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\src\addins\MonoDevelop.Autotools\MonoDevelop.Autotools.csproj">
<Project>{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}</Project>
<Name>MonoDevelop.Autotools</Name>
- <Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\src\core\MonoDevelop.Ide\MonoDevelop.Ide.csproj">
<Project>{27096E7F-C91C-4AC6-B289-6897A701DF21}</Project>
<Name>MonoDevelop.Ide</Name>
- <Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\src\addins\MonoDevelop.XmlEditor\MonoDevelop.XmlEditor.csproj">
<Project>{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}</Project>
<Name>MonoDevelop.XmlEditor</Name>
- <Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\src\addins\CSharpBinding\CSharpBinding.csproj">
<Project>{07CC7654-27D6-421D-A64C-0FFA40456FA2}</Project>
<Name>CSharpBinding</Name>
- <Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\src\core\Mono.Texteditor\Mono.TextEditor.csproj">
<Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
<Name>Mono.TextEditor</Name>
- <Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\src\addins\MonoDevelop.Refactoring\MonoDevelop.Refactoring.csproj">
<Project>{100568FC-F4E8-439B-94AD-41D11724E45B}</Project>
<Name>MonoDevelop.Refactoring</Name>
- <Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\src\addins\AspNet\MonoDevelop.AspNet\MonoDevelop.AspNet.csproj">
<Project>{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}</Project>
<Name>MonoDevelop.AspNet</Name>
- <Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\src\addins\MonoDevelop.DesignerSupport\MonoDevelop.DesignerSupport.csproj">
<Project>{2C24D515-4A2C-445C-8419-C09231913CFA}</Project>
<Name>MonoDevelop.DesignerSupport</Name>
- <Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\src\addins\VersionControl\MonoDevelop.VersionControl\MonoDevelop.VersionControl.csproj">
<Project>{19DE0F35-D204-4FD8-A553-A19ECE05E24D}</Project>
<Name>MonoDevelop.VersionControl</Name>
- <Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\src\addins\VersionControl\MonoDevelop.VersionControl.Git\MonoDevelop.VersionControl.Git.csproj">
<Project>{0413DB7D-8B35-423F-9752-D75C9225E7DE}</Project>
<Name>MonoDevelop.VersionControl.Git</Name>
- <Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\contrib\NRefactory\Project\NRefactory.csproj">
<Project>{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}</Project>
<Name>NRefactory</Name>
- <Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\contrib\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
<Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
<Name>ICSharpCode.NRefactory</Name>
- <Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\contrib\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">
<Project>{53DCA265-3C3C-42F9-B647-F72BA678122B}</Project>
<Name>ICSharpCode.NRefactory.CSharp</Name>
- <Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\external\ngit\NGit\NGit.csproj">
<Project>{E3BFF8B4-189C-496A-A817-7E8B31E22B91}</Project>
- <Private>False</Private>
<Name>NGit</Name>
</ProjectReference>
<ProjectReference Include="..\..\external\ngit\Sharpen\Sharpen.csproj">
<Project>{72944A6C-45FF-4EF8-B349-8C9CABF519D4}</Project>
- <Private>False</Private>
<Name>Sharpen</Name>
</ProjectReference>
<ProjectReference Include="..\..\external\ngit\NSch\NSch.csproj">
<Project>{A19E6F3F-A25B-4B01-8922-CF0CC35C781D}</Project>
- <Private>False</Private>
<Name>NSch</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\addins\MonoDevelop.SourceEditor2\MonoDevelop.SourceEditor.csproj">
<Project>{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}</Project>
- <Private>False</Private>
<Name>MonoDevelop.SourceEditor</Name>
</ProjectReference>
+ <ProjectReference Include="..\..\src\addins\MonoDevelop.Debugger\MonoDevelop.Debugger.csproj">
+ <Project>{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}</Project>
+ <Name>MonoDevelop.Debugger</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\src\addins\MonoDevelop.Debugger.Soft\MonoDevelop.Debugger.Soft.AspNet\MonoDevelop.Debugger.Soft.AspNet.csproj">
+ <Project>{F5390DA4-08B7-47E3-B6F3-D50683316AB4}</Project>
+ <Name>MonoDevelop.Debugger.Soft.AspNet</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\src\addins\CSharpBinding\Autotools\Autotools.csproj">
+ <Project>{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}</Project>
+ <Name>Autotools</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\src\addins\CBinding\CBinding.Autotools\CBinding.Autotools.csproj">
+ <Project>{B841F25D-4F6D-4E0D-885F-212B54381F28}</Project>
+ <Name>CBinding.Autotools</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\src\addins\CSharpBinding\AspNet\CSharpBinding.AspNet.csproj">
+ <Project>{F426CBB2-77FC-4E14-9E28-E667C2D1299A}</Project>
+ <Name>CSharpBinding.AspNet</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\src\addins\AspNet\MonoDevelop.AspNet.Mvc\MonoDevelop.AspNet.Mvc.csproj">
+ <Project>{B32AD0DD-5247-437B-A2EF-1A4676C1B072}</Project>
+ <Name>MonoDevelop.AspNet.Mvc</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\src\addins\TextTemplating\MonoDevelop.TextTemplating\MonoDevelop.TextTemplating.csproj">
+ <Project>{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}</Project>
+ <Name>MonoDevelop.TextTemplating</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\src\addins\TextTemplating\Mono.TextTemplating\Mono.TextTemplating.csproj">
+ <Project>{A2364D6A-00EF-417C-80A6-815726C70032}</Project>
+ <Name>Mono.TextTemplating</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\src\addins\Deployment\MonoDevelop.Deployment.Linux\MonoDevelop.Deployment.Linux.csproj">
+ <Project>{BA9020AD-A2D1-47C8-9A7C-756162C38296}</Project>
+ <Name>MonoDevelop.Deployment.Linux</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\src\core\Mono.Debugging\Mono.Debugging.csproj">
+ <Project>{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}</Project>
+ <Name>Mono.Debugging</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\src\addins\MonoDevelop.Debugger.Soft\Mono.Debugging.Soft\Mono.Debugging.Soft.csproj">
+ <Project>{DE40756E-57F6-4AF2-B155-55E3A88CCED8}</Project>
+ <Name>Mono.Debugging.Soft</Name>
+ </ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="Util.cs" />
@@ -246,7 +271,7 @@
<ProjectExtensions>
<MonoDevelop>
<Properties>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="true" IsAutotoolsProject="true" RelativeConfigureInPath="../..">
+ <MonoDevelop.Autotools.MakefileInfo RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="true" IsAutotoolsProject="true" RelativeConfigureInPath="../..">
<BuildFilesVar Sync="true" Name="FILES" />
<DeployFilesVar />
<ResourcesVar Sync="true" Name="RES" />
diff --git a/main/tests/UserInterfaceTests/UserInterfaceTests.csproj b/main/tests/UserInterfaceTests/UserInterfaceTests.csproj
index e38ef837f2..e25483a4b7 100644
--- a/main/tests/UserInterfaceTests/UserInterfaceTests.csproj
+++ b/main/tests/UserInterfaceTests/UserInterfaceTests.csproj
@@ -14,7 +14,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>..\..\build\bin</OutputPath>
+ <OutputPath>..\..\build\tests</OutputPath>
<DefineConstants>DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -22,7 +22,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
<Optimize>false</Optimize>
- <OutputPath>..\..\build\bin</OutputPath>
+ <OutputPath>..\..\build\tests</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-22 07:29:16 +0300