Skip to content

Commit

Permalink
[tools/install-source] Remove.
Browse files Browse the repository at this point in the history
This is legacy only, so we don't need it anymore.
  • Loading branch information
rolfbjarne committed Sep 6, 2024
1 parent 52ee455 commit da89a21
Show file tree
Hide file tree
Showing 28 changed files with 3 additions and 1,324 deletions.
3 changes: 0 additions & 3 deletions Make.config
Original file line number Diff line number Diff line change
Expand Up @@ -324,9 +324,6 @@ INCLUDE_HOTRESTART=1

ENABLE_DOTNET=1

# disable source code install by default (it's enabled for CI builds)
ENABLE_INSTALL_SOURCE=

ifeq ($(shell test $(shell echo $(MIN_IOS_SDK_VERSION) | sed 's/[.].*//') -ge 11; echo $$?),0)
IOS_SUPPORTS_32BIT_ARCHITECTURES=
else
Expand Down
11 changes: 0 additions & 11 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@ Usage: configure [options]
--enable-documentation Enable building of API documentation
--disable-documentation Disable building of API documentation.
--enable-install-source Enable building of API documentation
--disable-install-source Disable building of API documentation.
--enable-legacy-xamarin Enable building the legacy version of Xamarin.iOS/Xamarin.Mac.
--disable-legacy-xamarin Disable building the legacy version of Xamarin.iOS/Xamarin.Mac.
Expand Down Expand Up @@ -185,14 +182,6 @@ while test "x$1" != x; do
echo "$1 is ignored. Use --disable-dotnet instead"
shift
;;
--enable-install-source)
echo "ENABLE_INSTALL_SOURCE=1" >> "$CONFIGURED_FILE"
shift
;;
--disable-install-source)
echo "ENABLE_INSTALL_SOURCE=" >> "$CONFIGURED_FILE"
shift
;;
--enable-legacy-xamarin)
echo "INCLUDE_XAMARIN_LEGACY=1" >> "$CONFIGURED_FILE"
shift
Expand Down
6 changes: 0 additions & 6 deletions tests/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -225,12 +225,6 @@ test-macdev-tasks: verify-system-vsmac-xcode-match
$(Q) $(DOTNET) build "/bl:$@.binlog" $(TOP)/tests/msbuild/Xamarin.MacDev.Tasks.Tests/Xamarin.MacDev.Tasks.Tests.csproj /p:Configuration=Debug $(DOTNET_BUILD_VERBOSITY)
cd $(TOP)/tests/msbuild/Xamarin.MacDev.Tasks.Tests && $(SYSTEM_XIBUILD) -t -- $(abspath $(TOP)/tools/nunit3-console-3.11.1) $(abspath $(TOP)/tests/msbuild/Xamarin.MacDev.Tasks.Tests/bin/Debug/net472/Xamarin.MacDev.Tasks.Tests.dll) "--result=$(abspath $(CURDIR)/TestResults_Xamarin.MacDev.Tasks.Tests.xml)" -labels=After $(TEST_FIXTURE)

test-install-sources:
$(SYSTEM_XIBUILD) -- $(TOP)/tools/install-source/InstallSourcesTests/InstallSourcesTests.csproj
cd $(NUNIT_MSBUILD_DIR) && $(SYSTEM_XIBUILD) -t -- ../nunit-console.exe ../../../../tools/install-source/InstallSourcesTests/bin/Release/InstallSourcesTests.dll -xml=TestResults_InstallSourcesTests.xml -labels $(TEST_FIXTURE) || touch .failed-stamp
@[[ -z "$$BUILD_REPOSITORY" ]] || ( xsltproc $(TOP)/tests/HtmlTransform.xslt $(NUNIT_MSBUILD_DIR)/TestResults_InstallSourcesTests.xml > $(TOP)/tests/index.html && echo "@MonkeyWrench: AddFile: $$PWD/index.html" )
@if test -e $(NUNIT_MSBUILD_DIR)/.failed-stamp; then rm $(NUNIT_MSBUILD_DIR)/.failed-stamp; exit 1; fi

mac-test-package.zip:
ifdef INCLUDE_MAC
./package-mac-tests.sh
Expand Down
18 changes: 0 additions & 18 deletions tests/xharness/Jenkins/NUnitTestTasksEnumerable.cs
Original file line number Diff line number Diff line change
Expand Up @@ -73,24 +73,6 @@ public IEnumerator<RunTestTask> GetEnumerator ()
};
yield return nunitExecutioniOSMSBuildIntegration;

var installSourcesProject = new TestProject (TestLabel.InstallSource, Path.GetFullPath (Path.Combine (HarnessConfiguration.RootDirectory, "..", "tools", "install-source", "InstallSourcesTests", "InstallSourcesTests.csproj")));
var buildInstallSources = new MSBuildTask (jenkins: jenkins, testProject: installSourcesProject, processManager: processManager) {
SpecifyPlatform = false,
SpecifyConfiguration = false,
Platform = TestPlatform.iOS,
};
buildInstallSources.SolutionPath = Path.GetFullPath (Path.Combine (HarnessConfiguration.RootDirectory, "..", "tools", "install-source", "install-source.sln")); // this is required for nuget restore to be executed
var nunitExecutionInstallSource = new NUnitExecuteTask (jenkins, buildInstallSources, processManager) {
TestLibrary = Path.Combine (HarnessConfiguration.RootDirectory, "..", "tools", "install-source", "InstallSourcesTests", "bin", "Release", "InstallSourcesTests.dll"),
TestProject = installSourcesProject,
Platform = TestPlatform.iOS,
TestName = "Install Sources tests",
Mode = "iOS",
Timeout = TimeSpan.FromMinutes (60),
Ignored = !jenkins.TestSelection.IsEnabled (TestLabel.InstallSource) || (!jenkins.TestSelection.IsEnabled (PlatformLabel.Mac) && !jenkins.TestSelection.IsEnabled (PlatformLabel.iOSSimulator)),
};
yield return nunitExecutionInstallSource;

var buildMTouch = new MakeTask (jenkins: jenkins, processManager: processManager) {
TestProject = new TestProject (TestLabel.Mtouch, Path.GetFullPath (Path.Combine (HarnessConfiguration.RootDirectory, "mtouch", "mtouchtests.sln"))),
SpecifyPlatform = false,
Expand Down
1 change: 0 additions & 1 deletion tests/xharness/Jenkins/TestSelector.cs
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,6 @@ public void SelectTests (TestSelection selection)
selection.SetEnabled (PlatformLabel.LegacyXamarin, false);
selection.SetEnabled (PlatformLabel.watchOS, false);
selection.SetEnabled (TestLabel.Bcl, false);
selection.SetEnabled (TestLabel.InstallSource, false);
selection.SetEnabled (TestLabel.Mmp, false);
selection.SetEnabled (TestLabel.Mononative, false);
selection.SetEnabled (TestLabel.Mtouch, false);
Expand Down
3 changes: 1 addition & 2 deletions tests/xharness/TestLabel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ public enum TestLabel : Int64 {
Generator = 1 << 11,
[Label ("interdependent-binding-projects")]
InterdependentBindingProjects = 1 << 12,
[Label ("install-source")]
InstallSource = 1 << 13,
// 1 << 13 is unused
[Label ("introspection")]
Introspection = 1 << 14,
[Label ("linker")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ public void SetUp ()
}

[TestCase ("MSBuild tests")]
[TestCase ("Install Sources tests")]
[TestCase ("MTouch tests")]
[TestCase ("Generator tests")]
[TestCase ("Cecil-based tests")]
Expand Down
6 changes: 0 additions & 6 deletions tools/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,6 @@ SUBDIRS += nnyeah
endif
endif

ifdef INCLUDE_XAMARIN_LEGACY
ifdef ENABLE_INSTALL_SOURCE
SUBDIRS += install-source
endif
endif

ifdef ENABLE_DOTNET
SUBDIRS += dotnet-linker
endif
2 changes: 1 addition & 1 deletion tools/devops/automation/scripts/TestResults.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class TestResult {
[string] $Context
hidden [int] $Passed
hidden [int] $Failed
hidden [string[]] $NotTestSummaryLabels = @("install-source")
hidden [string[]] $NotTestSummaryLabels = @()

TestResult (
[string] $path,
Expand Down
1 change: 0 additions & 1 deletion tools/devops/automation/scripts/bash/configure-build.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#!/bin/bash -xe
flags=( "--enable-xamarin" )

flags=("${flags[@]}" --enable-install-source)
./configure "${flags[@]}"
7 changes: 0 additions & 7 deletions tools/devops/automation/templates/main-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,13 +142,6 @@ parameters:
containsLegacyTests: true,
testPrefix: 'simulator_tests',
},
{
label: install-source,
splitByPlatforms: false,
containsDotNetTests: false,
containsLegacyTests: true,
testPrefix: 'simulator_tests',
},
{
label: introspection,
splitByPlatforms: false,
Expand Down
7 changes: 0 additions & 7 deletions tools/devops/automation/templates/tests-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,13 +138,6 @@ parameters:
containsLegacyTests: true,
testPrefix: 'simulator_tests',
},
{
label: install-source,
splitByPlatforms: false,
containsDotNetTests: false,
containsLegacyTests: true,
testPrefix: 'simulator_tests',
},
{
label: introspection,
splitByPlatforms: false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ steps:
# Download the test report to write the comment.
- task: DownloadPipelineArtifact@2
displayName: Download Test Summary
continueOnError: true # there are tests that do not have the test results, so far only the install_sources has it
continueOnError: true
inputs:
patterns: "**/TestSummary.md"
allowFailedBuilds: true
Expand Down
2 changes: 0 additions & 2 deletions tools/install-source/.gitignore

This file was deleted.

22 changes: 0 additions & 22 deletions tools/install-source/IPathMangler.cs

This file was deleted.

This file was deleted.

47 changes: 0 additions & 47 deletions tools/install-source/InstallSourcesTests/MonoPathManglerTest.cs

This file was deleted.

44 changes: 0 additions & 44 deletions tools/install-source/InstallSourcesTests/OpenTKManglerTest.cs

This file was deleted.

Loading

0 comments on commit da89a21

Please sign in to comment.