Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2015-08-11 15:46:02 -0400
committerDavid Williams2015-08-11 15:46:02 -0400
commit6838405e40ccc4c443de3bf9f59d8dd4b1efcc94 (patch)
tree3543edec7936ca16e92d1311b2397b2eb074aa03
parent06884a0a8618ea9c7fa47a1f42697a4b36a43e98 (diff)
downloadeclipse.platform.releng.aggregator-6838405e40ccc4c443de3bf9f59d8dd4b1efcc94.tar.gz
eclipse.platform.releng.aggregator-6838405e40ccc4c443de3bf9f59d8dd4b1efcc94.tar.xz
eclipse.platform.releng.aggregator-6838405e40ccc4c443de3bf9f59d8dd4b1efcc94.zip
Bug 390986 - change platform names ...
... to contain accurate "bits" and VM Levels
-rw-r--r--production/testScripts/configuration/sdk.tests/testConfigs/macmini/testAll.sh4
-rw-r--r--production/testScripts/configuration/sdk.tests/testConfigs/macosx/testAll.sh4
-rw-r--r--production/testScripts/configuration/sdk.tests/testConfigs/win7-64/testAll.bat4
-rw-r--r--production/testScripts/configuration/sdk.tests/testConfigs/win7/testAll.bat2
4 files changed, 7 insertions, 7 deletions
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/macmini/testAll.sh b/production/testScripts/configuration/sdk.tests/testConfigs/macmini/testAll.sh
index d8319641..023cf5e6 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_7.0_consolelog.txt
+ ./runtestsmac.sh -os macosx -ws cocoa -arch $eclipseArch -extdirprop "${extdir}" -vm "${vmcmd}" -properties ${propertyFile} $* > results/consolelogs/${testedPlatform}_consolelog.txt
else
- ./runtestsmac.sh -os macosx -ws cocoa -arch $eclipseArch -vm "${vmcmd}" -properties ${propertyFile} $* > results/consolelogs/macosx.cocoa.x86_7.0_consolelog.txt
+ ./runtestsmac.sh -os macosx -ws cocoa -arch $eclipseArch -vm "${vmcmd}" -properties ${propertyFile} $* > results/consolelogs/${testedPlatform}_consolelog.txt
fi
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/testAll.sh b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/testAll.sh
index d930bd4f..7ecbabdf 100644
--- a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/testAll.sh
+++ b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/testAll.sh
@@ -34,7 +34,7 @@ cat ${propertyFile}
if [[ -n "${extdir}" ]]
then
- ./runtestsmac.sh -os macosx -ws cocoa -arch $eclipseArch -extdirprop "${extdir}" -vm "${vmcmd}" -properties ${propertyFile} $* > results/consolelogs/macosx.cocoa.x86_64_7.0_consolelog.txt
+ ./runtestsmac.sh -os macosx -ws cocoa -arch $eclipseArch -extdirprop "${extdir}" -vm "${vmcmd}" -properties ${propertyFile} $* > results/consolelogs/${testedPlatform}_consolelog.txt
else
- ./runtestsmac.sh -os macosx -ws cocoa -arch $eclipseArch -vm "${vmcmd}" -properties ${propertyFile} $* > results/consolelogs/macosx.cocoa.x86_64_7.0_consolelog.txt
+ ./runtestsmac.sh -os macosx -ws cocoa -arch $eclipseArch -vm "${vmcmd}" -properties ${propertyFile} $* > results/consolelogs/${testedPlatform}_consolelog.txt
fi
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 1e2af0cf..0f9e3e4b 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\win32.win32.x86_64_7.0_consolelog.txt
+runtests.bat -extdirprop "%extdir%" -os win32 -ws win32 -arch x86_64 -vm %vmcmd% -properties %propertyFile% %* > results\consolelogs\%testedPlatform%_consolelog.txt
GOTO END
)
-runtests.bat -os win32 -ws win32 -arch x86_64 -vm %vmcmd% -properties %propertyFile% %* > results\consolelogs\win32.win32.x86_64_7.0_consolelog.txt
+runtests.bat -os win32 -ws win32 -arch x86_64 -vm %vmcmd% -properties %propertyFile% %* > results\consolelogs\${testedPlatform}_consolelog.txt
:END
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/win7/testAll.bat b/production/testScripts/configuration/sdk.tests/testConfigs/win7/testAll.bat
index bfc5a4e5..246773d6 100644
--- a/production/testScripts/configuration/sdk.tests/testConfigs/win7/testAll.bat
+++ b/production/testScripts/configuration/sdk.tests/testConfigs/win7/testAll.bat
@@ -27,7 +27,7 @@ ECHO propertyFile in testAll: %propertyFile%
mkdir results\consolelogs
-set consolelogs=results\consolelogs\win32.win32.x86_7.0_consolelog.txt
+set consolelogs=results\consolelogs\%testedPlatform%_consolelog.txt
IF DEFINED extdir (
runtests.bat -extdirprop "%extdir%" -os win32 -ws win32 -arch x86 -vm %vmcmd% -properties %propertyFile% %* > %consolelogs%

Back to the top