Skip to main content
summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAbel Hegedus2017-03-17 12:54:27 +0000
committerAbel Hegedus2017-03-17 13:03:33 +0000
commit3482eedac7da869e4c474f7724385d64f551c79e (patch)
tree37c6c0643f9becaf3c4669e8c7740767cd15ff2e /tests
parent3e66be30b574b02e70c23b5faa5aa6e8725963e5 (diff)
downloadorg.eclipse.emf.diffmerge.core-3482eedac7da869e4c474f7724385d64f551c79e.tar.gz
org.eclipse.emf.diffmerge.core-3482eedac7da869e4c474f7724385d64f551c79e.tar.xz
org.eclipse.emf.diffmerge.core-3482eedac7da869e4c474f7724385d64f551c79e.zip
[releng] remove tests feature from SDK
The tests feature seems to have been unintentionally added to the SDK. Make UI test project a plugin to add it to tests Targlet, along with tests.customization. This will make Oomph Targlet import it. Change-Id: I68de1f226803d7c591b61e586e3547dd60d9bfd1 Signed-off-by: Abel Hegedus <abel.hegedus@incquerylabs.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.ui/.project11
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.ui/META-INF/MANIFEST.MF6
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.ui/build.properties1
3 files changed, 18 insertions, 0 deletions
diff --git a/tests/org.eclipse.emf.diffmerge.tests.ui/.project b/tests/org.eclipse.emf.diffmerge.tests.ui/.project
index 49c5c3a9..b79e4ab7 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.ui/.project
+++ b/tests/org.eclipse.emf.diffmerge.tests.ui/.project
@@ -10,8 +10,19 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.rcptt.core.rcpttnature</nature>
+ <nature>org.eclipse.pde.PluginNature</nature>
</natures>
</projectDescription>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.ui/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.diffmerge.tests.ui/META-INF/MANIFEST.MF
new file mode 100644
index 00000000..f86b5ae0
--- /dev/null
+++ b/tests/org.eclipse.emf.diffmerge.tests.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: EMF DiffMerge RCPTT suite
+Bundle-SymbolicName: org.eclipse.emf.diffmerge.tests.ui
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: Eclipse Modeling Project
diff --git a/tests/org.eclipse.emf.diffmerge.tests.ui/build.properties b/tests/org.eclipse.emf.diffmerge.tests.ui/build.properties
new file mode 100644
index 00000000..5f22cdd4
--- /dev/null
+++ b/tests/org.eclipse.emf.diffmerge.tests.ui/build.properties
@@ -0,0 +1 @@
+bin.includes = META-INF/

Back to the top