Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSravan Kumar Lakkimsetti2017-08-21 06:19:40 -0400
committerSravan Kumar Lakkimsetti2017-08-21 06:19:40 -0400
commit1778103393f2bc8fd86763e09baa75c056151e21 (patch)
tree2f82ef5030ee30f27bd234a42951c3761be733c4 /eclipse.platform.releng.tychoeclipsebuilder
parent1079988b461bdf6896a447a888ee35aa4d0f3ca1 (diff)
downloadeclipse.platform.releng.aggregator-1778103393f2bc8fd86763e09baa75c056151e21.tar.gz
eclipse.platform.releng.aggregator-1778103393f2bc8fd86763e09baa75c056151e21.tar.xz
eclipse.platform.releng.aggregator-1778103393f2bc8fd86763e09baa75c056151e21.zip
Bug 518239: [JUnit 5] Feature patch for JUnit 5 support on 4.7
Change-Id: I63ca7330437c90e249b8f0e852e270bc71bfdd91 Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
Diffstat (limited to 'eclipse.platform.releng.tychoeclipsebuilder')
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml6
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/computeRepoURLs.php4
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/download.php4
3 files changed, 7 insertions, 7 deletions
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml
index 053f33d4..550fa936 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml
@@ -537,16 +537,16 @@
-->
<condition property="buildIdOK">
<matches
- pattern="^[IMXYNPSR]\d{8}-\d{4}$"
+ pattern="^[IMXYNPSRU]\d{8}-\d{4}$"
string="${buildId}" />
</condition>
<fail
- message="buildId variable had unexpected format. Should be of the form [IMXYNPSR] 8 digits '-' 4 digits, but was ${buildId}"
+ message="buildId variable had unexpected format. Should be of the form [IMXYNPSRU] 8 digits '-' 4 digits, but was ${buildId}"
unless="buildIdOK" />
<script language="javascript"><![CDATA[
var buildId = project.getProperty("buildId");
- var pattern = new RegExp(/^([IMXYNPSR])(\d{8})-(\d{4})$/);
+ var pattern = new RegExp(/^([IMXYNPSRU])(\d{8})-(\d{4})$/);
var sArray = pattern.exec(buildId);
// sArray 0 is "whole match"
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/computeRepoURLs.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/computeRepoURLs.php
index be09b94a..7faaf728 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/computeRepoURLs.php
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/computeRepoURLs.php
@@ -49,7 +49,7 @@ function computeSTREAM_REPO_NAME () {
if ($BUILD_TYPE === "M" && isRRC($BUILD_ID)) {
$STREAM_REPO_NAME=$STREAM_MAJOR.".".$STREAM_MINOR."milestones";
} else {
- if ($BUILD_TYPE === "N" || $BUILD_TYPE === "I" || $BUILD_TYPE === "M" || $BUILD_TYPE === "P" || $BUILD_TYPE === "X" || $BUILD_TYPE === "Y") {
+ if ($BUILD_TYPE === "N" || $BUILD_TYPE === "U" || $BUILD_TYPE === "I" || $BUILD_TYPE === "M" || $BUILD_TYPE === "P" || $BUILD_TYPE === "X" || $BUILD_TYPE === "Y") {
$STREAM_REPO_NAME=$STREAM_MAJOR.".".$STREAM_MINOR."-".$BUILD_TYPE."-"."builds";
} else {
if ($BUILD_TYPE === "S") {
@@ -78,7 +78,7 @@ function computeSTREAM_REPO_URL () {
function computeBUILD_REPO_NAME () {
global $BUILD_ID, $BUILD_TYPE, $TIMESTAMP ;
// There are two types of M builds, some RCs, some not.
- if ($BUILD_TYPE === "N" || $BUILD_TYPE === "I" || $BUILD_TYPE === "P" || $BUILD_TYPE === "X" || $BUILD_TYPE === "Y" || $BUILD_TYPE === "M" && ! ((isSRRC($BUILD_ID)) || isRRC($BUILD_ID))) {
+ if ($BUILD_TYPE === "N" || $BUILD_TYPE === "U" || $BUILD_TYPE === "I" || $BUILD_TYPE === "P" || $BUILD_TYPE === "X" || $BUILD_TYPE === "Y" || $BUILD_TYPE === "M" && ! ((isSRRC($BUILD_ID)) || isRRC($BUILD_ID))) {
$BUILD_REPO_NAME=computeSTREAM_REPO_NAME ()."/".$BUILD_ID;
} else {
$timestamp = str_replace('-', '', $TIMESTAMP);
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/download.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/download.php
index 25d9ed6a..b015e237 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/download.php
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/download.php
@@ -52,10 +52,10 @@ if (array_key_exists("SERVER_NAME", $_SERVER)) {
$isRC = true;
}
- if ($BUILD_TYPE === "N" || $BUILD_TYPE === "I" || $BUILD_TYPE === "P" || $BUILD_TYPE === "X" || $BUILD_TYPE === "Y" || ($BUILD_TYPE === "M" && ! $isRC)) {
+ if ($BUILD_TYPE === "N" || $BUILD_TYPE === "U" || $BUILD_TYPE === "I" || $BUILD_TYPE === "P" || $BUILD_TYPE === "X" || $BUILD_TYPE === "Y" || ($BUILD_TYPE === "M" && ! $isRC)) {
$BUILD_DIR_NAME = $BUILD_ID;
} else {
- if ($BUILD_TYPE === "R" || $BUILD_TYPE === "S" || $BUILD_TYPE === "P" || $BUILD_TYPE === "X" || $BUILD_TYPE === "Y" || ($BUILD_TYPE === "M" && $isRC)) {
+ if ($BUILD_TYPE === "R" || $BUILD_TYPE === "S" || $BUILD_TYPE === "U" || $BUILD_TYPE === "P" || $BUILD_TYPE === "X" || $BUILD_TYPE === "Y" || ($BUILD_TYPE === "M" && $isRC)) {
$timestamp = str_replace('-', '', $TIMESTAMP);
$BUILD_DIR_NAME = $BUILD_TYPE."-".$BUILD_ID."-".$timestamp;
} else {

Back to the top