[med-svn] [Git][med-team/artemis][master] 4 commits: Remove fix-test.patch from series file because the patch is gone.
Markus Koschany
gitlab at salsa.debian.org
Tue Aug 14 09:35:47 BST 2018
Markus Koschany pushed to branch master at Debian Med / artemis
Commits:
84756515 by Markus Koschany at 2018-08-14T07:48:48Z
Remove fix-test.patch from series file because the patch is gone.
- - - - -
a61359af by Markus Koschany at 2018-08-14T07:53:26Z
Add build-test.patch
- - - - -
afc31980 by Markus Koschany at 2018-08-14T08:19:48Z
Update test-classpath.patch
- - - - -
00796d14 by Markus Koschany at 2018-08-14T08:30:53Z
Add disable-tests.patch.
- - - - -
4 changed files:
- + debian/patches/build-test.patch
- + debian/patches/disable-tests.patch
- debian/patches/series
- debian/patches/test-classpath.patch
Changes:
=====================================
debian/patches/build-test.patch
=====================================
--- /dev/null
+++ b/debian/patches/build-test.patch
@@ -0,0 +1,24 @@
+From: Markus Koschany <apo at debian.org>
+Date: Tue, 14 Aug 2018 09:52:57 +0200
+Subject: build-test
+
+---
+ test/build-test.xml | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/test/build-test.xml b/test/build-test.xml
+index e90aa5e..ccd771e 100644
+--- a/test/build-test.xml
++++ b/test/build-test.xml
+@@ -161,11 +161,6 @@
+ <target name="get-java-version">
+ <echo>Java/JVM version: ${ant.java.version}</echo>
+ <echo>Java/JVM detail version: ${java.version}</echo>
+- <condition property="java.version.check">
+- <not>
+- <equals arg1="${ant.java.version}" arg2="${java.major.version}"/>
+- </not>
+- </condition>
+ </target>
+
+ <target name="check-java-version" depends="get-java-version" if="java.version.check">
=====================================
debian/patches/disable-tests.patch
=====================================
--- /dev/null
+++ b/debian/patches/disable-tests.patch
@@ -0,0 +1,57 @@
+From: Markus Koschany <apo at debian.org>
+Date: Tue, 14 Aug 2018 10:30:21 +0200
+Subject: disable tests
+
+---
+ .../artemis/circular/MemoryComboBox_ESTest.java | 31 ----------------------
+ 1 file changed, 31 deletions(-)
+
+diff --git a/test/evosuite-tests/uk/ac/sanger/artemis/circular/MemoryComboBox_ESTest.java b/test/evosuite-tests/uk/ac/sanger/artemis/circular/MemoryComboBox_ESTest.java
+index ef18964..05868f5 100644
+--- a/test/evosuite-tests/uk/ac/sanger/artemis/circular/MemoryComboBox_ESTest.java
++++ b/test/evosuite-tests/uk/ac/sanger/artemis/circular/MemoryComboBox_ESTest.java
+@@ -143,16 +143,6 @@ public class MemoryComboBox_ESTest extends MemoryComboBox_ESTest_scaffolding {
+ assertTrue(boolean0);
+ }
+
+- @Test(timeout = 4000)
+- public void test09() throws Throwable {
+- Vector<TextField> vector0 = new Vector<TextField>(24, 0);
+- DefaultTableModel defaultTableModel0 = new DefaultTableModel(vector0, vector0);
+- Vector vector1 = defaultTableModel0.getDataVector();
+- MemoryComboBox memoryComboBox0 = new MemoryComboBox(vector1);
+- boolean boolean0 = memoryComboBox0.isForwardPage();
+- assertFalse(boolean0);
+- }
+-
+ @Test(timeout = 4000)
+ public void test10() throws Throwable {
+ JembossParams jembossParams0 = new JembossParams();
+@@ -162,27 +152,6 @@ public class MemoryComboBox_ESTest extends MemoryComboBox_ESTest_scaffolding {
+ assertFalse(boolean0);
+ }
+
+- @Test(timeout = 4000)
+- public void test11() throws Throwable {
+- Vector<TextField> vector0 = new Vector<TextField>(24, 0);
+- DefaultTableModel defaultTableModel0 = new DefaultTableModel(vector0, vector0);
+- Vector vector1 = defaultTableModel0.getDataVector();
+- MemoryComboBox memoryComboBox0 = new MemoryComboBox(vector1);
+- boolean boolean0 = memoryComboBox0.isBackPage();
+- assertFalse(boolean0);
+- }
+-
+- @Test(timeout = 4000)
+- public void test12() throws Throwable {
+- Vector<TextField> vector0 = new Vector<TextField>(24, 0);
+- DefaultTableModel defaultTableModel0 = new DefaultTableModel(vector0, vector0);
+- Vector vector1 = defaultTableModel0.getDataVector();
+- defaultTableModel0.addColumn((Object) vector0, (Vector) vector0);
+- MemoryComboBox memoryComboBox0 = new MemoryComboBox(vector1);
+- memoryComboBox0.setLastIndex(vector1);
+- assertEquals("[(this Collection)]", vector1.toString());
+- }
+-
+ @Test(timeout = 4000)
+ public void test13() throws Throwable {
+ Stack<Canvas> stack0 = new Stack<Canvas>();
=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,5 @@ jar-rules.patch
test-classpath.patch
samreader.patch
use-lang3.patch
-fix-test.patch
+build-test.patch
+disable-tests.patch
=====================================
debian/patches/test-classpath.patch
=====================================
--- a/debian/patches/test-classpath.patch
+++ b/debian/patches/test-classpath.patch
@@ -1,19 +1,29 @@
-Description: Change CLASSPATH to use external jars in build-test.xml
-Author: Afif Elghraoui <afif at ghraoui.name>
+From: Afif Elghraoui <afif at ghraoui.name>
+Date: Tue, 14 Aug 2018 10:17:32 +0200
+Subject: Change CLASSPATH to use external jars in build-test.xml
+
Forwarded: not-needed
Last-Update: 2015-10-22
+---
+ test/build-test.xml | 15 ++++-----------
+ 1 file changed, 4 insertions(+), 11 deletions(-)
+
+diff --git a/test/build-test.xml b/test/build-test.xml
+index 53fd27d..8ad62d4 100644
--- a/test/build-test.xml
+++ b/test/build-test.xml
-@@ -40,8 +40,6 @@
+@@ -40,8 +40,8 @@
<property name="build.compiler" value="modern" />
<property name="classpath" value="." />
<property name="src.tests.dir" value="." />
- <property name="src.lib.dir" value="lib" />
- <property name="mainlib.dir" value="../lib" />
++ <property name="src.lib.dir" value="/usr/share/java/" />
++ <property name="mainlib.dir" value="/usr/share/EMBOSS/jemboss/lib" />
<property name="build.dir" value="./ant-build" />
-@@ -87,10 +85,10 @@
+@@ -87,10 +87,10 @@
<pathelement path="${artemis.classes.dir}" />
<pathelement path="${build.dest.tests}" />
<!-- Dependency classes -->
@@ -26,7 +36,7 @@ Last-Update: 2015-10-22
<include name="**/*.jar" />
</fileset>
<pathelement path=".." />
-@@ -221,13 +219,6 @@
+@@ -221,13 +221,6 @@
</fileset>
</copy>
View it on GitLab: https://salsa.debian.org/med-team/artemis/compare/35bedc44b0e44b8dd79b01a8f20dcc3a2f4cfeef...00796d14e6b9f0d6bfc0790edcf0f7c98bf113d8
--
View it on GitLab: https://salsa.debian.org/med-team/artemis/compare/35bedc44b0e44b8dd79b01a8f20dcc3a2f4cfeef...00796d14e6b9f0d6bfc0790edcf0f7c98bf113d8
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20180814/d5dc252a/attachment-0001.html>
More information about the debian-med-commit
mailing list