Bug 431047 - test results are not getting summarized on DL page

11 files changed, 10 insertions, 32 deletions

diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/linux/testAll.sh b/production/testScripts/configuration/sdk.tests/testConfigs/linux/testAll.sh
index a246fe941..c5ed7b3ac 100644
--- a/production/testScripts/configuration/sdk.tests/testConfigs/linux/testAll.sh
+++ b/production/testScripts/configuration/sdk.tests/testConfigs/linux/testAll.sh
@@ -34,9 +34,9 @@ echo "buildId in testAll: ${buildId}"
 
 if [[ -n "${extdir}" ]]
 then
-./runtests.sh -os linux -ws gtk -arch $eclipseArch -extdirprop "${extdir}" -vm "${vmcmd}" -properties ${propertyFile} $* > results/consolelogs/linux.gtk.x86_64_6.0_consolelog.txt
+./runtests.sh -os linux -ws gtk -arch $eclipseArch -extdirprop "${extdir}" -vm "${vmcmd}" -properties ${propertyFile} $* > results/consolelogs/linux.gtk.x86_64_8.0_consolelog.txt
 else
-./runtests.sh -os linux -ws gtk -arch $eclipseArch -vm "${vmcmd}" -properties ${propertyFile} $* > results/consolelogs/linux.gtk.x86_64_6.0_consolelog.txt	
+./runtests.sh -os linux -ws gtk -arch $eclipseArch -vm "${vmcmd}" -properties ${propertyFile} $* > results/consolelogs/linux.gtk.x86_64_8.0_consolelog.txt	
 fi
 
 
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/linux/testing.properties b/production/testScripts/configuration/sdk.tests/testConfigs/linux/testing.properties
index 7ff7018a3..8a332d209 100644
--- a/production/testScripts/configuration/sdk.tests/testConfigs/linux/testing.properties
+++ b/production/testScripts/configuration/sdk.tests/testConfigs/linux/testing.properties
@@ -32,9 +32,6 @@ previousRuntimePlatform=eclipse-platform-3.7.1-linux-gtk.tar.gz
 #directory where test scripts are launched
 executionDir=${testDir}/eclipse-testing
 
-#name of file that captures console output from running JUnit plug-in tests
-consolelog=linux-6.0_consolelog.txt
-
 testExecutable=bash
 
 #name of script to execute on remote machine
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/linux32/testAll.sh b/production/testScripts/configuration/sdk.tests/testConfigs/linux32/testAll.sh
index 18de4199c..e17129c58 100644
--- a/production/testScripts/configuration/sdk.tests/testConfigs/linux32/testAll.sh
+++ b/production/testScripts/configuration/sdk.tests/testConfigs/linux32/testAll.sh
@@ -33,9 +33,9 @@ echo "propertyFile in testAll: ${propertyFile}"
 
 if [[ -n "${extdir}" ]]
 then
-./runtests.sh -os linux -ws gtk -arch $eclipseArch -extdirprop "${extdir}" -vm "${vmcmd}" -properties ${propertyFile} $* > results/consolelogs/linux.gtk-6.0_consolelog.txt
+./runtests.sh -os linux -ws gtk -arch $eclipseArch -extdirprop "${extdir}" -vm "${vmcmd}" -properties ${propertyFile} $* > results/consolelogs/linux.gtk.x86_8.0_consolelog.txt
 else
-./runtests.sh -os linux -ws gtk -arch $eclipseArch -vm "${vmcmd}" -properties ${propertyFile} $* > results/consolelogs/linux.gtk-6.0_consolelog.txt	
+./runtests.sh -os linux -ws gtk -arch $eclipseArch -vm "${vmcmd}" -properties ${propertyFile} $* > results/consolelogs/linux.gtk.x86_8.0_consolelog.txt	
 fi
 
 
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/linux32/testing.properties b/production/testScripts/configuration/sdk.tests/testConfigs/linux32/testing.properties
index 8ed865e48..ac6c6b9ee 100644
--- a/production/testScripts/configuration/sdk.tests/testConfigs/linux32/testing.properties
+++ b/production/testScripts/configuration/sdk.tests/testConfigs/linux32/testing.properties
@@ -32,9 +32,6 @@ previousRuntimePlatform=eclipse-platform-3.7.1-linux-gtk.tar.gz
 #directory where test scripts are launched
 executionDir=${testDir}/eclipse-testing
 
-#name of file that captures console output from running JUnit plug-in tests
-consolelog=linux-6.0_consolelog.txt
-
 testExecutable=bash
 
 #name of script to execute on remote machine
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/macmini/testAll.sh b/production/testScripts/configuration/sdk.tests/testConfigs/macmini/testAll.sh
index f30d0c499..858675d11 100644
--- a/production/testScripts/configuration/sdk.tests/testConfigs/macmini/testAll.sh
+++ b/production/testScripts/configuration/sdk.tests/testConfigs/macmini/testAll.sh
@@ -33,7 +33,7 @@ echo "propertyFile in testAll: ${propertyFile}"
 
 if [[ -n "${extdir}" ]]
 then
-./runtestsmac.sh -os macosx -ws cocoa -arch $eclipseArch -extdirprop "${extdir}" -vm "${vmcmd}" -properties ${propertyFile} $* > results/consolelogs/macosx.cocoa.x86_5.0_consolelog.txt
+./runtestsmac.sh -os macosx -ws cocoa -arch $eclipseArch -extdirprop "${extdir}" -vm "${vmcmd}" -properties ${propertyFile} $* > results/consolelogs/macosx.cocoa.x86_7.0_consolelog.txt
 else
-./runtestsmac.sh -os macosx -ws cocoa -arch $eclipseArch -vm "${vmcmd}" -properties ${propertyFile} $* > results/consolelogs/macosx.cocoa.x86_5.0_consolelog.txt	
+./runtestsmac.sh -os macosx -ws cocoa -arch $eclipseArch -vm "${vmcmd}" -properties ${propertyFile} $* > results/consolelogs/macosx.cocoa.x86_7.0_consolelog.txt
 fi
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/macmini/testing.properties b/production/testScripts/configuration/sdk.tests/testConfigs/macmini/testing.properties
index d67c036a5..4cbdac382 100644
--- a/production/testScripts/configuration/sdk.tests/testConfigs/macmini/testing.properties
+++ b/production/testScripts/configuration/sdk.tests/testConfigs/macmini/testing.properties
@@ -32,9 +32,6 @@ previousRuntimePlatform=eclipse-platform-3.7.1-macosx-cocoa.tar.gz
 #directory where test scripts are launched
 executionDir=${testDir}/eclipse-testing
 
-#name of file that captures console output from running JUnit plug-in tests
-consolelog=macosx.cocoa_consolelog.txt
-
 testExecutable=bash
 
 #name of script to execute on remote machine
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/testing.properties b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/testing.properties
index 02592486c..a9fea10f9 100644
--- a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/testing.properties
+++ b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/testing.properties
@@ -32,9 +32,6 @@ previousRuntimePlatform=eclipse-platform-3.7.1-macosx-cocoa.tar.gz
 #directory where test scripts are launched
 executionDir=${testDir}/eclipse-testing
 
-#name of file that captures console output from running JUnit plug-in tests
-consolelog=macosx.cocoa_consolelog.txt
-
 testExecutable=bash
 
 #name of script to execute on remote machine
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/win7-64/testAll.bat b/production/testScripts/configuration/sdk.tests/testConfigs/win7-64/testAll.bat
index 36079c503..1e2af0cf7 100644
--- a/production/testScripts/configuration/sdk.tests/testConfigs/win7-64/testAll.bat
+++ b/production/testScripts/configuration/sdk.tests/testConfigs/win7-64/testAll.bat
@@ -27,10 +27,10 @@ ECHO propertyFile in testAll: %propertyFile%
 mkdir results\consolelogs
 
 IF DEFINED extdir (
-runtests.bat -extdirprop "%extdir%" -os win32 -ws win32 -arch x86_64 -vm %vmcmd% -properties %propertyFile%  %* > results\consolelogs\win7consolelog.txt
+runtests.bat -extdirprop "%extdir%" -os win32 -ws win32 -arch x86_64 -vm %vmcmd% -properties %propertyFile%  %* > results\consolelogs\win32.win32.x86_64_7.0_consolelog.txt
 GOTO END
 )
 
-runtests.bat -os win32 -ws win32 -arch x86_64 -vm %vmcmd% -properties %propertyFile%  %* > results\consolelogs\win7consolelog.txt
+runtests.bat -os win32 -ws win32 -arch x86_64 -vm %vmcmd% -properties %propertyFile%  %* > results\consolelogs\win32.win32.x86_64_7.0_consolelog.txt
 
 :END
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/win7-64/testing.properties b/production/testScripts/configuration/sdk.tests/testConfigs/win7-64/testing.properties
index ae76e251e..3e8a1fd2f 100644
--- a/production/testScripts/configuration/sdk.tests/testConfigs/win7-64/testing.properties
+++ b/production/testScripts/configuration/sdk.tests/testConfigs/win7-64/testing.properties
@@ -35,16 +35,11 @@ previousRuntimePlatform=eclipse-platform-3.7.1-win32.zip
 #directory where test scripts are launched
 executionDir=${testDir}\\eclipse-testing
 
-#name of file that captures console output from running JUnit plug-in tests
-consolelog=win7-6.0_consolelog.txt
-
 testExecutable=cmd
 
 #name of script to execute on remote machine
 #testScript=start /min /wait ${executionDir}\\testAll.bat
 testScript=${executionDir}\\testAll.bat
 
-#arguments to $(testScript)
-#args=/c win7-6.0_consolelog.txt
 #Bug 384974 - consider explicit argument for tests to run
 args=
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/win7/testAll.bat b/production/testScripts/configuration/sdk.tests/testConfigs/win7/testAll.bat
index c1b5cd3e4..a338dbba7 100644
--- a/production/testScripts/configuration/sdk.tests/testConfigs/win7/testAll.bat
+++ b/production/testScripts/configuration/sdk.tests/testConfigs/win7/testAll.bat
@@ -28,10 +28,10 @@ ECHO propertyFile in testAll: %propertyFile%
 mkdir results\consolelogs
 
 IF DEFINED extdir (
-runtests.bat -extdirprop "%extdir%" -os win32 -ws win32 -arch x86 -vm %vmcmd% -properties %propertyFile%  %* > results\consolelogs\win7consolelog.txt
+runtests.bat -extdirprop "%extdir%" -os win32 -ws win32 -arch x86 -vm %vmcmd% -properties %propertyFile%  %* > results\consolelogs\win32.win32.x86_7.0_consolelog.txt
 GOTO END
 )
 
-runtests.bat -os win32 -ws win32 -arch x86 -vm %vmcmd% -properties %propertyFile%  %* > results\consolelogs\win7consolelog.txt
+runtests.bat -os win32 -ws win32 -arch x86 -vm %vmcmd% -properties %propertyFile%  %* > results\win32.win32.x86_7.0_consolelog.txt
 
 :END
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/win7/testing.properties b/production/testScripts/configuration/sdk.tests/testConfigs/win7/testing.properties
index 0ef4989a7..430423f5a 100644
--- a/production/testScripts/configuration/sdk.tests/testConfigs/win7/testing.properties
+++ b/production/testScripts/configuration/sdk.tests/testConfigs/win7/testing.properties
@@ -35,16 +35,11 @@ previousRuntimePlatform=eclipse-platform-3.7.1-win32.zip
 #directory where test scripts are launched
 executionDir=${testDir}\\eclipse-testing
 
-#name of file that captures console output from running JUnit plug-in tests
-consolelog=win7-6.0_consolelog.txt
-
 testExecutable=cmd
 
 #name of script to execute on remote machine
 #testScript=start /min /wait ${executionDir}\\testAll.bat
 testScript=${executionDir}\\testAll.bat
 
-#arguments to $(testScript)
-#args=/c win7-6.0_consolelog.txt
 #Bug 384974 - consider explicit argument for tests to run
 args=