aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2010-05-27 03:24:54 -0400
committerEike Stepper2010-05-27 03:24:54 -0400
commit6196fdff23daacf90e014e40e5541a9f4f5fec7f (patch)
tree32343abfcd9f7f6095328bbfcfdff4c9604315d0
parent1fe727e5c943907eea5c56c2948ce54ba52b40a3 (diff)
downloadcdo-6196fdff23daacf90e014e40e5541a9f4f5fec7f.tar.gz
cdo-6196fdff23daacf90e014e40e5541a9f4f5fec7f.tar.xz
cdo-6196fdff23daacf90e014e40e5541a9f4f5fec7f.zip
[314605] MergingTest fails occasionally on Hudson
https://bugs.eclipse.org/bugs/show_bug.cgi?id=314605
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (H2 audit).launch (renamed from plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (H2).launch)0
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (Hsqldb audit).launch (renamed from plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (Hsqldb).launch)0
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (Hsqldb non-audit).launch (renamed from plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (Hsqldb - nonaudit).launch)0
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (PostgreSQL non-audit).launch (renamed from plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (PostgreSQL - noaudit).launch)0
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/CDO AllTests (Hibernate standalone).launch (renamed from plugins/org.eclipse.emf.cdo.tests.hibernate/CDO AllTests (Hibernate -standalone).launch)0
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/CDO AllTests (MEM audit).launch (renamed from plugins/org.eclipse.emf.cdo.tests/CDO AllTests (All Configs).launch)7
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/CDO AllTests (MEM branching).launch15
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/CDO AllTests (MEM embedded).launch (renamed from plugins/org.eclipse.emf.cdo.tests/CDO AllTests (Embedded).launch)0
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/CDO AllTests (MEM legacy).launch (renamed from plugins/org.eclipse.emf.cdo.tests/CDO AllTests (Legacy).launch)0
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/CDO AllTests (MEM non-audit).launch15
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/CDO AllTests (MEM offline).launch (renamed from plugins/org.eclipse.emf.cdo.tests/CDO AllTests (Offline).launch)0
11 files changed, 33 insertions, 4 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (H2).launch b/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (H2 audit).launch
index caabdcdb00..caabdcdb00 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (H2).launch
+++ b/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (H2 audit).launch
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (Hsqldb).launch b/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (Hsqldb audit).launch
index dd70e23951..dd70e23951 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (Hsqldb).launch
+++ b/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (Hsqldb audit).launch
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (Hsqldb - nonaudit).launch b/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (Hsqldb non-audit).launch
index 2177180bdb..2177180bdb 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (Hsqldb - nonaudit).launch
+++ b/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (Hsqldb non-audit).launch
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (PostgreSQL - noaudit).launch b/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (PostgreSQL non-audit).launch
index d624f94450..d624f94450 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (PostgreSQL - noaudit).launch
+++ b/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (PostgreSQL non-audit).launch
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/CDO AllTests (Hibernate -standalone).launch b/plugins/org.eclipse.emf.cdo.tests.hibernate/CDO AllTests (Hibernate standalone).launch
index 3c20b95881..3c20b95881 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/CDO AllTests (Hibernate -standalone).launch
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/CDO AllTests (Hibernate standalone).launch
diff --git a/plugins/org.eclipse.emf.cdo.tests/CDO AllTests (All Configs).launch b/plugins/org.eclipse.emf.cdo.tests/CDO AllTests (MEM audit).launch
index d36dc1746f..509c051c86 100644
--- a/plugins/org.eclipse.emf.cdo.tests/CDO AllTests (All Configs).launch
+++ b/plugins/org.eclipse.emf.cdo.tests/CDO AllTests (MEM audit).launch
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllConfigs.java"/>
+<listEntry value="/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMAudit.java"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
@@ -9,8 +9,7 @@
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.cdo.tests.AllConfigs"/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.cdo.tests.AllTestsMEMAudit"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.cdo.tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m&#13;&#10;-Xmx512m"/>
</launchConfiguration>
diff --git a/plugins/org.eclipse.emf.cdo.tests/CDO AllTests (MEM branching).launch b/plugins/org.eclipse.emf.cdo.tests/CDO AllTests (MEM branching).launch
new file mode 100644
index 0000000000..3524fce45f
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests/CDO AllTests (MEM branching).launch
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranches.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.cdo.tests.AllTestsMEMBranches"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.cdo.tests"/>
+</launchConfiguration>
diff --git a/plugins/org.eclipse.emf.cdo.tests/CDO AllTests (Embedded).launch b/plugins/org.eclipse.emf.cdo.tests/CDO AllTests (MEM embedded).launch
index a4ae627679..a4ae627679 100644
--- a/plugins/org.eclipse.emf.cdo.tests/CDO AllTests (Embedded).launch
+++ b/plugins/org.eclipse.emf.cdo.tests/CDO AllTests (MEM embedded).launch
diff --git a/plugins/org.eclipse.emf.cdo.tests/CDO AllTests (Legacy).launch b/plugins/org.eclipse.emf.cdo.tests/CDO AllTests (MEM legacy).launch
index 0c9632c355..0c9632c355 100644
--- a/plugins/org.eclipse.emf.cdo.tests/CDO AllTests (Legacy).launch
+++ b/plugins/org.eclipse.emf.cdo.tests/CDO AllTests (MEM legacy).launch
diff --git a/plugins/org.eclipse.emf.cdo.tests/CDO AllTests (MEM non-audit).launch b/plugins/org.eclipse.emf.cdo.tests/CDO AllTests (MEM non-audit).launch
new file mode 100644
index 0000000000..cee85921e3
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests/CDO AllTests (MEM non-audit).launch
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMNonAudit.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.cdo.tests.AllTestsMEMNonAudit"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.cdo.tests"/>
+</launchConfiguration>
diff --git a/plugins/org.eclipse.emf.cdo.tests/CDO AllTests (Offline).launch b/plugins/org.eclipse.emf.cdo.tests/CDO AllTests (MEM offline).launch
index 25018247f3..25018247f3 100644
--- a/plugins/org.eclipse.emf.cdo.tests/CDO AllTests (Offline).launch
+++ b/plugins/org.eclipse.emf.cdo.tests/CDO AllTests (MEM offline).launch