diff options
-rw-r--r-- | releng/Papyrus - Main tests - Generated.launch (renamed from releng/Main tests - Generated.launch) | 12 | ||||
-rw-r--r-- | releng/org.eclipse.papyrus.oomph/setups/papyrus.setup | 4 | ||||
-rw-r--r-- | tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus Generated Diagram Tests.launch | 45 |
3 files changed, 55 insertions, 6 deletions
diff --git a/releng/Main tests - Generated.launch b/releng/Papyrus - Main tests - Generated.launch index c00d343750c..5f3d6b11966 100644 --- a/releng/Main tests - Generated.launch +++ b/releng/Papyrus - Main tests - Generated.launch @@ -1,14 +1,18 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType"> <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/> -<stringAttribute key="M2_GOALS" value="clean verify -f top-pom-main-tests.xml"/> +<stringAttribute key="M2_GOALS" value="clean verify"/> <booleanAttribute key="M2_NON_RECURSIVE" value="false"/> <booleanAttribute key="M2_OFFLINE" value="false"/> <stringAttribute key="M2_PROFILES" value=""/> <listAttribute key="M2_PROPERTIES"> -<listEntry value="papyrus.repo.main=file:/${project_loc:releng}/main/target/repository"/> +<listEntry value="papyrus.repo.main.local=file:/${project_loc:releng}/main/site/target/repository"/> <listEntry value="testConfig=GENERATED_TESTS_CONFIG"/> -<listEntry value="papyrus.repo.main.online=https://hudson.eclipse.org/papyrus/job/Papyrus-Master/lastSuccessfulBuild/artifact/releng/main/target/repository/"/> +<listEntry value="papyrus.repo.main=https://hudson.eclipse.org/papyrus/job/Papyrus-Master/lastSuccessfulBuild/artifact/repository/"/> +<listEntry value="papyrus.repo.dev=https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/"/> +<listEntry value="papyrus.repo.dev.local=file:/${project_loc:releng}/dev/site/target/repository"/> +<listEntry value="tycho-version=0.21.0"/> +<listEntry value="testSuite=org.eclipse.papyrus.tests.AllGenTests"/> </listAttribute> <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/> <booleanAttribute key="M2_SKIP_TESTS" value="false"/> @@ -16,5 +20,5 @@ <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/> <stringAttribute key="M2_USER_SETTINGS" value=""/> <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/> -<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc:releng}"/> +<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc:releng}/main-tests"/> </launchConfiguration> diff --git a/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup b/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup index 29f8d948504..c3c18db8d29 100644 --- a/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup +++ b/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup @@ -1836,7 +1836,7 @@ <requirement name="org.eclipse.b3.aggregator.engine.feature.feature.group"/> <repositoryList> <repository url="${oomph.update.url}"/> - <repository url="http://download.eclipse.org/modeling/emft/b3/updates-4.3/"/> + <repository url="http://download.eclipse.org/modeling/emft/b3/updates-4.4/"/> </repositoryList> </targlet> </setupTask> @@ -1861,7 +1861,7 @@ <requirement name="org.eclipse.b3.aggregator.engine.feature.feature.group"/> <repository url="https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/"/> <repository url="${base.downloads.url}/modeling/mdt/papyrus/updates/nightly/neon/main"/> - <repository url="http://download.eclipse.org/modeling/emft/b3/updates-4.3/"/> + <repository url="http://download.eclipse.org/modeling/emft/b3/updates-4.4/"/> </setupTask> </stream> <stream label="streams/1.1-maintenance (Mars/1.1.x)" name="streams/1.1-maintenance"> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus Generated Diagram Tests.launch b/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus Generated Diagram Tests.launch new file mode 100644 index 00000000000..da71e977a5b --- /dev/null +++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus Generated Diagram Tests.launch @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> +<booleanAttribute key="askclear" value="false"/> +<booleanAttribute key="automaticAdd" value="true"/> +<booleanAttribute key="automaticValidate" value="false"/> +<stringAttribute key="bootstrap" value=""/> +<stringAttribute key="checked" value="[NONE]"/> +<booleanAttribute key="clearConfig" value="true"/> +<booleanAttribute key="clearws" value="true"/> +<booleanAttribute key="clearwslog" value="false"/> +<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Papyrus Generated Diagram Tests"/> +<booleanAttribute key="default" value="true"/> +<booleanAttribute key="includeOptional" value="true"/> +<stringAttribute key="location" value="${workspace_loc}/../junit-failures-workspace"/> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> +<listEntry value="/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllGenTests.java"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> +<listEntry value="1"/> +</listAttribute> +<mapAttribute key="org.eclipse.debug.core.environmentVariables"> +<mapEntry key="skip.long.junit.tests" value="false"/> +</mapAttribute> +<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"/> +<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/> +<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.tests.AllGenTests"/> +<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -testConfig=GENERATED_TESTS_CONFIG"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.tests"/> +<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.6 -Xms512m -Xmx2048m -DsuppressRawWhenUnchecked=true -XX:MaxPermSize=512M -XX:SoftRefLRUPolicyMSPerMB=100"/> +<stringAttribute key="pde.version" value="3.3"/> +<stringAttribute key="product" value="org.eclipse.platform.ide"/> +<booleanAttribute key="run_in_ui_thread" value="true"/> +<booleanAttribute key="show_selected_only" value="false"/> +<booleanAttribute key="tracing" value="true"/> +<booleanAttribute key="useCustomFeatures" value="false"/> +<booleanAttribute key="useDefaultConfig" value="true"/> +<booleanAttribute key="useDefaultConfigArea" value="true"/> +<booleanAttribute key="useProduct" value="true"/> +<stringAttribute key="yk-options" value=" additional-options2=onexit\=snapshot "/> +</launchConfiguration> |