[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
[emfcompare-build] [Hudson] Build failed in Hudson: master-build-on-egit-logical-nighlty » oxygen-extras,JDK_1.8.0_Latest #602
|
See <https://hudson.eclipse.org/emfcompare/job/master-build-on-egit-logical-nighlty/./PLATFORM=oxygen-extras,jdk=JDK_1.8.0_Latest/602/>
------------------------------------------
Started by upstream job "master-build-on-egit-logical-nighlty" build number 602
Checkout:JDK_1.8.0_Latest / <https://hudson.eclipse.org/emfcompare/job/master-build-on-egit-logical-nighlty/./PLATFORM=oxygen-extras,jdk=JDK_1.8.0_Latest/ws/> - hudson.remoting.LocalChannel@415c8d9
Using strategy: Default
Git Exe: git
Last Built Revision: Revision 15516eace82431f09127a24e687200b2f1be68ef (origin/master)
Checkout:JDK_1.8.0_Latest / <https://hudson.eclipse.org/emfcompare/job/master-build-on-egit-logical-nighlty/./PLATFORM=oxygen-extras,jdk=JDK_1.8.0_Latest/ws/> - hudson.remoting.LocalChannel@415c8d9
Cloning the remote Git repository
Cloning repository origin
Fetching upstream changes from /gitroot/emfcompare/org.eclipse.emf.compare.git
Commencing build of Revision 15516eace82431f09127a24e687200b2f1be68ef (origin/master)
Checking out Revision 15516eace82431f09127a24e687200b2f1be68ef (origin/master)
Starting xvnc
[JDK_1.8.0_Latest] $ Xvnc :367 -geometry 1024x768 -depth 24 -ac -SecurityTypes none -noreset
[JDK_1.8.0_Latest] $ /bin/sh -xe /tmp/hudson2289862300585766603.sh
+ echo 'We de-activate the git tests for now as they currently fail.'
We de-activate the git tests for now as they currently fail.
Xvnc TigerVNC 1.4.1 - built ??? ?? ???? ??:??:??
Copyright (C) 1999-2013 TigerVNC Team and many others (see README.txt)
See http://www.tigervnc.org for information on TigerVNC.
Underlying X server release 11502000, The X.Org Foundation
Initializing built-in extension VNC-EXTENSION
Initializing built-in extension Generic Event Extension
Initializing built-in extension SHAPE
Initializing built-in extension MIT-SHM
Initializing built-in extension XInputExtension
Initializing built-in extension XTEST
Initializing built-in extension BIG-REQUESTS
Initializing built-in extension SYNC
Initializing built-in extension XKEYBOARD
Initializing built-in extension XC-MISC
Initializing built-in extension XFIXES
Initializing built-in extension RENDER
Initializing built-in extension RANDR
Initializing built-in extension COMPOSITE
Initializing built-in extension DAMAGE
Initializing built-in extension MIT-SCREEN-SAVER
Initializing built-in extension DOUBLE-BUFFER
Initializing built-in extension RECORD
Initializing built-in extension DPMS
Initializing built-in extension Present
Initializing built-in extension X-Resource
Initializing built-in extension XVideo
Initializing built-in extension XVideo-MotionCompensation
Initializing built-in extension GLX
Tue Sep 26 11:35:51 2017
vncext: VNC extension running!
vncext: Listening for VNC connections on all interface(s), port 6267
vncext: created VNC server for screen 0
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/91499 patch-set 3'
>> Cherry-picking https://git.eclipse.org/r/#/c/91499 patch-set 3
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/99/91499/3
[dix] Could not init font path element /usr/share/fonts/TTF/, removing from list!
[dix] Could not init font path element /usr/share/fonts/OTF/, removing from list!
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/99/91499/3 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 737e1cd] Add progress reporting for post processors
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
6 files changed, 107 insertions(+), 21 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/98242 patch-set 4'
>> Cherry-picking https://git.eclipse.org/r/#/c/98242 patch-set 4
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/42/98242/4
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/42/98242/4 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD eca3b90] [516257] Show diagram changes in the context of the UML model
Author: Tobias Ortmayr <tortmayr.ext@xxxxxxxxxxxxxxxxx>
2 files changed, 344 insertions(+)
create mode 100644 plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/src/org/eclipse/emf/compare/diagram/ide/ui/papyrus/internal/structuremergeviewer/groups/impl/PapyrusGroupProvider.java
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/102981 patch-set 2'
>> Cherry-picking https://git.eclipse.org/r/#/c/102981 patch-set 2
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/81/102981/2
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/81/102981/2 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 89bfe25] [516259] Introduce action to resolve multiple conflicts
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
27 files changed, 908 insertions(+), 228 deletions(-)
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/structuremergeviewer/actions/AbstractMergeRunnableTest.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/structuremergeviewer/actions/MergeConflictingRunnableTest.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/icons/full/dtoolb16/accept_contained_conflicting_diffs.png
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/icons/full/dtoolb16/accept_contained_non_conflicting_diffs.png
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/icons/full/dtoolb16/merge_contained_conflicting_diffs_to_left.png
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/icons/full/dtoolb16/merge_contained_conflicting_diffs_to_right.png
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/icons/full/dtoolb16/merge_contained_non_conflicting_diffs_to_left.png
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/icons/full/dtoolb16/merge_contained_non_conflicting_diffs_to_right.png
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/icons/full/dtoolb16/reject_contained_conflicting_diffs.png
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/icons/full/dtoolb16/reject_contained_non_conflicting_diffs.png
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/icons/full/etoolb16/accept_contained_conflicting_diffs.png
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/icons/full/etoolb16/accept_contained_non_conflicting_diffs.png
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/icons/full/etoolb16/merge_contained_conflicting_diffs_to_left.png
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/icons/full/etoolb16/merge_contained_conflicting_diffs_to_right.png
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/icons/full/etoolb16/merge_contained_non_conflicting_diffs_to_left.png
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/icons/full/etoolb16/merge_contained_non_conflicting_diffs_to_right.png
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/icons/full/etoolb16/reject_contained_conflicting_diffs.png
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/icons/full/etoolb16/reject_contained_non_conflicting_diffs.png
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/AbstractMergeContainedAction.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeConflictingRunnable.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeContainedConflictingAction.java
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/104681 patch-set 4'
>> Cherry-picking https://git.eclipse.org/r/#/c/104681 patch-set 4
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/81/104681/4
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/81/104681/4 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 270c9c0] [522017] Bug 522017: Concurrency problems in ResourceComputationScheduler
Author: Christian W. Damus <give.a.damus@xxxxxxxxx>
2 files changed, 424 insertions(+), 51 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/104766 patch-set 3'
>> Cherry-picking https://git.eclipse.org/r/#/c/104766 patch-set 3
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/66/104766/3
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/66/104766/3 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 32313b0] [522064] [UML] Profile-application version check too restrictive
Author: Christian W. Damus <give.a.damus@xxxxxxxxx>
14 files changed, 360 insertions(+), 17 deletions(-)
create mode 100644 plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/data/dynamic/a3/left.uml
create mode 100644 plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/data/dynamic/a3/origin.uml
create mode 100644 plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/data/dynamic/a3/right.uml
create mode 100644 plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/data/dynamic/a4/left.uml
create mode 100644 plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/data/dynamic/a4/origin.uml
create mode 100644 plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/data/dynamic/a4/right.uml
create mode 100644 plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/data/dynamic/a5/left.uml
create mode 100644 plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/data/dynamic/a5/origin.uml
create mode 100644 plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/data/dynamic/a5/right.uml
create mode 100644 plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/util/UMLCompareIterables.java
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/97575 patch-set 6'
>> Cherry-picking https://git.eclipse.org/r/#/c/97575 patch-set 6
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/75/97575/6
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/75/97575/6 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD a7d8193] [516248] Actions for previous/next unresolved change
Author: Martin Fleck <mfleck@xxxxxxxxxxxxxxxxx>
12 files changed, 276 insertions(+), 111 deletions(-)
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/icons/full/toolb16/next_unresolved_diff.png
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/icons/full/toolb16/prev_unresolved_diff.png
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/SelectDiffAction.java
delete mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/SelectNextDiffAction.java
delete mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/SelectPreviousDiffAction.java
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/104589 patch-set 2'
>> Cherry-picking https://git.eclipse.org/r/#/c/104589 patch-set 2
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/89/104589/2
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/89/104589/2 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 259ce8c] [516248] Improve Navigatable caching
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
2 files changed, 85 insertions(+), 63 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/105075 patch-set 1'
>> Cherry-picking https://git.eclipse.org/r/#/c/105075 patch-set 1
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/75/105075/1
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/75/105075/1 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: could not apply d55bc76... [521948] Support changing the state of diffs already in terminal state
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
Terminating xvnc.
Recording test results
Archiving artifacts
--
This message is automatically generated by Hudson.
For more information on Hudson, see: http://hudson-ci.org/
