[releng] Re-enable Oxygen platform, Disable JUnit plugin tests
diff --git a/releng/org.eclipse.qvtd.releng.buckminster/releng/qvtd.rmap b/releng/org.eclipse.qvtd.releng.buckminster/releng/qvtd.rmap
index fa1cad5..70effed 100644
--- a/releng/org.eclipse.qvtd.releng.buckminster/releng/qvtd.rmap
+++ b/releng/org.eclipse.qvtd.releng.buckminster/releng/qvtd.rmap
@@ -303,7 +303,7 @@
</rm:provider>
</rm:searchPath>
<rm:searchPath name="eclipse-platform">
- <!--rm:provider componentTypes="eclipse.feature,osgi.bundle" resolutionFilter="(&(resolve.target.platform=true)(|(build.type=I)(build.type=N)))" readerType="p2" source="false" mutable="false">
+ <rm:provider componentTypes="eclipse.feature,osgi.bundle" resolutionFilter="(&(resolve.target.platform=true)(|(build.type=I)(build.type=N)))" readerType="p2" source="false" mutable="false">
<rm:property key="buckminster.source" value="false"/>
<rm:property key="buckminster.mutable" value="false"/>
<rm:uri format="{0}/eclipse/updates/4.7-I-builds">
@@ -323,7 +323,7 @@
<rm:uri format="{0}/eclipse/updates/4.7">
<bc:propertyRef key="eclipse.download"/>
</rm:uri>
- </rm:provider-->
+ </rm:provider>
<rm:provider componentTypes="eclipse.feature,osgi.bundle" resolutionFilter="(&(resolve.target.platform=true)(|(build.type=I)(build.type=M)(build.type=N)(build.type=R)(build.type=S)))" readerType="p2" source="false" mutable="false">
<rm:property key="buckminster.source" value="false"/>
<rm:property key="buckminster.mutable" value="false"/>
diff --git a/releng/org.eclipse.qvtd.releng.buckminster/scripts/qvtd-buckminster.script b/releng/org.eclipse.qvtd.releng.buckminster/scripts/qvtd-buckminster.script
index 7c5b817..56003b2 100644
--- a/releng/org.eclipse.qvtd.releng.buckminster/scripts/qvtd-buckminster.script
+++ b/releng/org.eclipse.qvtd.releng.buckminster/scripts/qvtd-buckminster.script
@@ -12,7 +12,7 @@
build
junit --launch "org.eclipse.qvtd.all.tests/.launches/All\ QVTd\ Tests\ \(standalone\).launch" --flatXML --output "${checkout.location}/QVTd.test.results/org.eclipse.qvtd.xtext.qvtd.all.xml"
-junit --launch "org.eclipse.qvtd.all.tests/.launches/All\ QVTd\ Tests\ \(Plugin\).launch" --flatXML --output "${checkout.location}/QVTd.test.results/org.eclipse.qvtd.xtext.qvtd.all.plugin.xml"
+#junit --launch "org.eclipse.qvtd.all.tests/.launches/All\ QVTd\ Tests\ \(Plugin\).launch" --flatXML --output "${checkout.location}/QVTd.test.results/org.eclipse.qvtd.xtext.qvtd.all.plugin.xml"
perform --properties "${checkout.location}/buildroot/build.properties" "-Dbuckminster.reference.repository=${reference.repository}" "org.eclipse.qvtd.releng.build:eclipse.feature#build"
perform --properties "${checkout.location}/buildroot/build.properties" "org.eclipse.qvtd.releng.buckminster:buckminster#setup.promoter"
diff --git a/releng/org.eclipse.qvtd.releng.buckminster/scripts/qvtd-tests-buckminster.script b/releng/org.eclipse.qvtd.releng.buckminster/scripts/qvtd-tests-buckminster.script
index a8293e9..6d54a81 100644
--- a/releng/org.eclipse.qvtd.releng.buckminster/scripts/qvtd-tests-buckminster.script
+++ b/releng/org.eclipse.qvtd.releng.buckminster/scripts/qvtd-tests-buckminster.script
@@ -12,7 +12,7 @@
build
junit --launch "org.eclipse.qvtd.all.tests/.launches/All\ QVTd\ Tests\ \(standalone\).launch" --flatXML --output "${checkout.location}/QVTd.test.results/org.eclipse.qvtd.xtext.qvtd.all.xml"
-junit --launch "org.eclipse.qvtd.all.tests/.launches/All\ QVTd\ Tests\ \(Plugin\).launch" --flatXML --output "${checkout.location}/QVTd.test.results/org.eclipse.qvtd.xtext.qvtd.all.plugin.xml"
+#junit --launch "org.eclipse.qvtd.all.tests/.launches/All\ QVTd\ Tests\ \(Plugin\).launch" --flatXML --output "${checkout.location}/QVTd.test.results/org.eclipse.qvtd.xtext.qvtd.all.plugin.xml"
perform --properties "${checkout.location}/buildroot/build.properties" "-Dbuckminster.reference.repository=${reference.repository}" "org.eclipse.qvtd.releng.build:eclipse.feature#build"
perform --properties "${checkout.location}/buildroot/build.properties" "org.eclipse.qvtd.releng.buckminster:buckminster#setup.promoter"
