Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSravan Kumar Lakkimsetti2020-07-06 22:59:41 -0400
committerSravan Kumar Lakkimsetti2020-07-06 22:59:41 -0400
commit64c35b71765267b62170a4177d7d4b211f653b67 (patch)
treea551a5a6141ca00c27d19e31b1f1550cda0d0021
parent8e88c8a4d1a61691923259c9c170c0370f12e35f (diff)
downloadeclipse.platform.releng.aggregator-64c35b71765267b62170a4177d7d4b211f653b67.tar.gz
eclipse.platform.releng.aggregator-64c35b71765267b62170a4177d7d4b211f653b67.tar.xz
eclipse.platform.releng.aggregator-64c35b71765267b62170a4177d7d4b211f653b67.zip
Bug 563431 - Remove the Nashorn JavaScript Engine useI20200706-2300
Fixed updateSiteSegment property Change-Id: I835e225004b11f76cfc8f184ec8973ad76c9ec19 Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
-rw-r--r--production/testScripts/runTests2.xml18
1 files changed, 12 insertions, 6 deletions
diff --git a/production/testScripts/runTests2.xml b/production/testScripts/runTests2.xml
index 63b49352a..5aedb065b 100644
--- a/production/testScripts/runTests2.xml
+++ b/production/testScripts/runTests2.xml
@@ -95,7 +95,6 @@
<echo message="eclipseStream: ${eclipseStream}" />
<echo message="eclipseStreamMajor: ${eclipseStreamMajor}" />
<echo message="eclipseStreamMinor: ${eclipseStreamMinor}" />
- <echo message="eclipseStreamService: ${eclipseStreamService}" />
<echo message="buildType: ${buildType}" />
<echo message="testSuite: ${testSuite}" />
@@ -762,7 +761,17 @@
</filterchain>
</loadresource>
<echo message="eclipseStreamMinor: ${eclipseStreamMinor}"/>
-
+
+ <loadresource property="updateSiteSegment">
+ <string value="${eclipseStream}"/>
+ <filterchain>
+ <tokenfilter>
+ <replaceregex pattern="^(\d+)\.(\d+)(\.(\d+))" replace="\1\.\2"/>
+ </tokenfilter>
+ </filterchain>
+ </loadresource>
+ <echo message="updateSiteSegment: ${updateSiteSegment}"/>
+
<!--
<script language="javascript">
<![CDATA[
@@ -788,9 +797,6 @@
<fail
unless="eclipseStreamMinor"
message="eclipseStreamMinor not defined or computable" />
- <!-- eclipseStreamService may not always be defined? And we do not currently
- use it. <fail unless="eclipseStreamService" message="eclipseStreamService
- not defined or computable" /> -->
<fail
unless="updateSiteSegment"
message="updateSiteSegment not defined or computable" />
@@ -1207,7 +1213,7 @@
<echo message="javaversion in setJavaMajorVersion: ${javaversionEscaped}" />
<loadresource property="javaMajorVersion">
- <string value="${javaversionExcaped}"/>
+ <string value="${javaversionEscaped}"/>
<filterchain>
<tokenfilter>
<replaceregex pattern='^.* "(\d+)[\.-].*' replace="\1"/>

Back to the top