Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--production/testScripts/configuration/streamSpecific.properties4
-rw-r--r--production/testScripts/runTests2.xml1
-rwxr-xr-xproduction/testScripts/test_runTests2.xml.sh4
3 files changed, 2 insertions, 7 deletions
diff --git a/production/testScripts/configuration/streamSpecific.properties b/production/testScripts/configuration/streamSpecific.properties
index fc1b83933..9c00e1b6f 100644
--- a/production/testScripts/configuration/streamSpecific.properties
+++ b/production/testScripts/configuration/streamSpecific.properties
@@ -41,10 +41,6 @@ baselinePerfVersion=S-4.17RC2-202009021800
baselinePerfVersionLabel=4.17
baselinePerfBuildId=I20200902-1800
-# Derby database cannot used to store performance results anymore. (see Bug 548523)
-# Instead samples are serialized into a file and included in build artifacts.
-#eclipse.perf.dbloc.value=//build.eclipse.org:1527
-
# We currently set here, but would be better to compute this value
# by peeking in the "to be tested" tar file.
isMacAppLayout=true
diff --git a/production/testScripts/runTests2.xml b/production/testScripts/runTests2.xml
index 98c96f920..de56c421d 100644
--- a/production/testScripts/runTests2.xml
+++ b/production/testScripts/runTests2.xml
@@ -464,7 +464,6 @@
<printProperty property="configurationDir" />
<printProperty property="org.eclipse.core.net.prefs" />
<printProperty property="testSuite" />
- <printProperty property="skipDerby" />
<printProperty property="test.target" />
<printProperty property="testExecutable" />
<printProperty property="testScript" />
diff --git a/production/testScripts/test_runTests2.xml.sh b/production/testScripts/test_runTests2.xml.sh
index f3a4461c2..1f2003ded 100755
--- a/production/testScripts/test_runTests2.xml.sh
+++ b/production/testScripts/test_runTests2.xml.sh
@@ -91,8 +91,8 @@ echo "PWD: $PWD"
# ? There are a number of test-<something> methods in test xml which, by convention, mean
# to simply test the test script itself. The test-all target runs all of those tests.
# MUST change the arch values here, then testing on other platforms!
-ant -f "${WORKSPACE}/${ANTFILE}" -Dbasebuilderlocal=/shared/eclipse/buildtests -DbuildId=$buildId -DeclipseStream=$eclipseStream -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=x86_64 -DEBUILDER_HASH=${EBUILDER_HASH} -DdownloadURL=https://download.eclipse.org/eclipse/downloads/drops4/${buildId} -Dtest.target=performance -DskipDerby=true
-#ant -f "${WORKSPACE}/${ANTFILE}" -Dbasebuilderlocal=/shared/eclipse/buildtests -DbuildId=$buildId -DeclipseStream=$eclipseStream -Dosgi.os=macosx -Dosgi.ws=cocoa -Dosgi.arch=x86_64 -DEBUILDER_HASH=${EBUILDER_HASH} -DdownloadURL=https://download.eclipse.org/eclipse/downloads/drops4/${buildId} -Dtest.target=performance -DskipDerby=true
+ant -f "${WORKSPACE}/${ANTFILE}" -Dbasebuilderlocal=/shared/eclipse/buildtests -DbuildId=$buildId -DeclipseStream=$eclipseStream -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=x86_64 -DEBUILDER_HASH=${EBUILDER_HASH} -DdownloadURL=https://download.eclipse.org/eclipse/downloads/drops4/${buildId} -Dtest.target=performance
+#ant -f "${WORKSPACE}/${ANTFILE}" -Dbasebuilderlocal=/shared/eclipse/buildtests -DbuildId=$buildId -DeclipseStream=$eclipseStream -Dosgi.os=macosx -Dosgi.ws=cocoa -Dosgi.arch=x86_64 -DEBUILDER_HASH=${EBUILDER_HASH} -DdownloadURL=https://download.eclipse.org/eclipse/downloads/drops4/${buildId} -Dtest.target=performance
rc=$?
if [[ $rc == 0 ]]
then

Back to the top