Fix build error in org.eclipse.test.
(cherry picked from commit 07893f9ee9a6306b0b6f4764fecca7d6f8a8999f)
This commit is contained in:
parent
ff810a71ad
commit
2df424ffc5
@ -0,0 +1,50 @@
|
|||||||
|
From 7955cc64a07f38c57f45c9ce79d53031c4502c23 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Sravan Kumar Lakkimsetti
|
||||||
|
Date: Wed, 28 Apr 2021 12:23:23 +0530
|
||||||
|
Subject: Bug 573206 - I20210428-0040 - BUILD FAILED with compilation failure
|
||||||
|
in org.eclipse.test
|
||||||
|
|
||||||
|
Update to Ant 1.10.10
|
||||||
|
|
||||||
|
Change-Id: I5273072f05d1080b2df61e8c839b4292d1b63c48
|
||||||
|
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
|
||||||
|
Reviewed-on:https://git.eclipse.org/r/c/platform/eclipse.platform.releng/+/179905
|
||||||
|
---
|
||||||
|
.../src/org/eclipse/test/LegacyXmlResultFormatter.java | 9 ++++++++-
|
||||||
|
1 files changed, 9 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/eclipse.platform.releng/bundles/org.eclipse.test/src/org/eclipse/test/LegacyXmlResultFormatter.java b/eclipse.platform.releng/bundles/org.eclipse.test/src/org/eclipse/test/LegacyXmlResultFormatter.java
|
||||||
|
index e7011aae4..99676ef77 100644
|
||||||
|
--- a/eclipse.platform.releng/bundles/org.eclipse.test/src/org/eclipse/test/LegacyXmlResultFormatter.java
|
||||||
|
+++ b/eclipse.platform.releng/bundles/org.eclipse.test/src/org/eclipse/test/LegacyXmlResultFormatter.java
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
/*******************************************************************************
|
||||||
|
- * Copyright (c) 2018 Red Hat Inc. and others.
|
||||||
|
+ * Copyright (c) 2021 Red Hat Inc. and others.
|
||||||
|
*
|
||||||
|
* This program and the accompanying materials
|
||||||
|
* are made available under the terms of the Eclipse Public License 2.0
|
||||||
|
@@ -64,6 +64,8 @@ public class LegacyXmlResultFormatter extends AbstractJUnitResultFormatter {
|
||||||
|
final AtomicLong numTestsSkipped = new AtomicLong(0);
|
||||||
|
final AtomicLong numTestsAborted = new AtomicLong(0);
|
||||||
|
|
||||||
|
+ private boolean useLegacyReportingName = false;
|
||||||
|
+
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void testPlanExecutionStarted(final TestPlan plan) {
|
||||||
|
@@ -156,6 +158,11 @@ public class LegacyXmlResultFormatter extends AbstractJUnitResultFormatter {
|
||||||
|
this.startedAt = startedAt;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+ @Override
|
||||||
|
+ public void setUseLegacyReportingName(final boolean useLegacyReportingName) {
|
||||||
|
+ this.useLegacyReportingName = useLegacyReportingName;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
|
||||||
|
private final class XMLReportWriter {
|
||||||
|
|
||||||
|
--
|
||||||
|
2.30.0
|
||||||
|
|
||||||
@ -11,7 +11,7 @@
|
|||||||
Name: eclipse
|
Name: eclipse
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 4.11
|
Version: 4.11
|
||||||
Release: 3
|
Release: 4
|
||||||
Summary: An open, extensible IDE
|
Summary: An open, extensible IDE
|
||||||
License: EPL-2.0
|
License: EPL-2.0
|
||||||
URL: http://www.eclipse.org/
|
URL: http://www.eclipse.org/
|
||||||
@ -36,6 +36,7 @@ Patch28: prefer_x11_backend.patch
|
|||||||
Patch29: fix_ant_build.patch
|
Patch29: fix_ant_build.patch
|
||||||
Patch30: eclipse-hide-droplets-from-install-wizard.patch
|
Patch30: eclipse-hide-droplets-from-install-wizard.patch
|
||||||
Patch31: org-eclipse-swt.patch
|
Patch31: org-eclipse-swt.patch
|
||||||
|
Patch32: BUILD-FAILED-with-compilation-failure-in-org-eclipse-test.patch
|
||||||
ExcludeArch: s390 %{arm} %{ix86}
|
ExcludeArch: s390 %{arm} %{ix86}
|
||||||
BuildRequires: maven-local tycho tycho-extras cbi-plugins maven-antrun-plugin
|
BuildRequires: maven-local tycho tycho-extras cbi-plugins maven-antrun-plugin
|
||||||
BuildRequires: maven-assembly-plugin maven-dependency-plugin maven-enforcer-plugin
|
BuildRequires: maven-assembly-plugin maven-dependency-plugin maven-enforcer-plugin
|
||||||
@ -203,6 +204,7 @@ rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/
|
|||||||
%patch29
|
%patch29
|
||||||
%patch30 -p1
|
%patch30 -p1
|
||||||
%patch31
|
%patch31
|
||||||
|
%patch32 -p1
|
||||||
rm eclipse.platform.swt/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/accessibility/Bug543949_ComponentExtentsTest.py
|
rm eclipse.platform.swt/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/accessibility/Bug543949_ComponentExtentsTest.py
|
||||||
%pom_remove_dep :tycho-buildtimestamp-jgit eclipse-platform-parent
|
%pom_remove_dep :tycho-buildtimestamp-jgit eclipse-platform-parent
|
||||||
%pom_remove_dep :tycho-sourceref-jgit eclipse-platform-parent
|
%pom_remove_dep :tycho-sourceref-jgit eclipse-platform-parent
|
||||||
@ -745,6 +747,9 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist}
|
|||||||
%{_eclipsedir}/plugins/org.eclipse.osgi.util_*
|
%{_eclipsedir}/plugins/org.eclipse.osgi.util_*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Feb 16 2022 yaoxin <yaoxin30@huawei.com> - 1:4.11-4
|
||||||
|
- Fix build error in org.eclipse.test.
|
||||||
|
|
||||||
* Sat Jul 31 2021 liping<liping136@huawei.com> - 1:4.11-3
|
* Sat Jul 31 2021 liping<liping136@huawei.com> - 1:4.11-3
|
||||||
- fix by upgrade to GCC-10
|
- fix by upgrade to GCC-10
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user